git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 719518f)
mergetools: add winmerge as a builtin tool
authorDavid Aguilar <redacted>
Wed, 20 May 2015 09:07:23 +0000 (02:07 -0700)
committerJunio C Hamano <redacted>
Wed, 20 May 2015 20:13:44 +0000 (13:13 -0700)
commit3e4f2373b295e19dbc1a6bd0e743f65b500b7bda
tree6f01b1a4c5fd077ad07b99b19a9fdc58a031f552tree | snapshot
parent719518f5cebba0fb4ed6caf6d92d683e858120f0commit | diff
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 <redacted>
Helped-by: Johannes Schindelin <redacted>
Helped-by: Sebastian Schuberth <redacted>
Helped-by: SZEDER Gábor <redacted>
Signed-off-by: David Aguilar <redacted>
Signed-off-by: Junio C Hamano <redacted>
mergetools/winmerge [new file with mode: 0644] blob
git clone https://git.99rst.org/PROJECT