| commit | 3e4f2373b295e19dbc1a6bd0e743f65b500b7bda | |
| author | David Aguilar <davvid@gmail.com> | |
| Wed, 20 May 2015 09:07:23 +0000 (20 02:07 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 20 May 2015 20:13:44 +0000 (20 13:13 -0700) | ||
| tree | 6f01b1a4c5fd077ad07b99b19a9fdc58a031f552 | treesnapshot (tar.gz zip) |
| parent | 719518f5cebba0fb4ed6caf6d92d683e858120f0 | commitdiff |
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>
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>
| mergetools/winmerge | [new file with mode: 0644] | blob |