1
0
mirror of https://github.com/git/git.git synced 2025-03-15 06:11:21 +00:00
git/mergetools
David Aguilar 3e4f2373b2 mergetools: add winmerge as a builtin tool
Add a winmerge scriptlet with the commands described in [1] so
that users can use winmerge without needing to perform any
additional configuration.

[1] http://thread.gmane.org/gmane.comp.version-control.git/268631

Helped-by: Philip Oakley <philipoakley@iee.org>
Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Helped-by: Sebastian Schuberth <sschuberth@gmail.com>
Helped-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-05-20 13:13:44 -07:00
..
bc
2014-10-21 11:25:30 -07:00
bc3
2014-10-21 11:25:30 -07:00
2014-04-22 12:49:07 -07:00
2014-04-22 12:49:07 -07:00
2014-04-22 12:49:07 -07:00