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
..
araxis	…
bc	mergetool: rename bc3 to bc	2014-10-21 11:25:30 -07:00
bc3	mergetool: rename bc3 to bc	2014-10-21 11:25:30 -07:00
codecompare	…
deltawalker	…
diffmerge	mergetools: stop setting $status in merge_cmd()	2014-11-21 11:27:53 -08:00
diffuse	…
ecmerge	…
emerge	mergetools: stop setting $status in merge_cmd()	2014-11-21 11:27:53 -08:00
gvimdiff	…
gvimdiff2	…
gvimdiff3	…
kdiff3	mergetools: stop setting $status in merge_cmd()	2014-11-21 11:27:53 -08:00
kompare	…
meld	…
opendiff	…
p4merge	…
tkdiff	…
tortoisemerge	…
vimdiff	…
vimdiff2	…
vimdiff3	…
winmerge	mergetools: add winmerge as a builtin tool	2015-05-20 13:13:44 -07:00
xxdiff	…