| commit | b98c212a9fd97300a8cf39015b8d693f319fd71c | |
| author | Markus Heidelberg <markus.heidelberg@web.de> | |
| Mon, 6 Apr 2009 08:31:18 +0000 (6 01:31 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 8 Apr 2009 05:19:55 +0000 (7 22:19 -0700) | ||
| tree | a5786f8382dba31f7b168592295e351f10e40e22 | treesnapshot (tar.gz zip) |
| parent | bad42732008cb0c1e77046d716e4446b1545d4d0 | commitdiff |
git-mergetool: add new merge tool TortoiseMerge
TortoiseMerge comes with TortoiseSVN or TortoiseGit for Windows. It can
only be used as a merge tool with an existing base file. It cannot be
used without a base nor as a diff tool.
The documentation only mentions the slash '/' as command line option
prefix, which refused to work, but the parser also accepts the dash '-'
See http://code.google.com/p/msysgit/issues/detail?id=226
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
TortoiseMerge comes with TortoiseSVN or TortoiseGit for Windows. It can
only be used as a merge tool with an existing base file. It cannot be
used without a base nor as a diff tool.
The documentation only mentions the slash '/' as command line option
prefix, which refused to work, but the parser also accepts the dash '-'
See http://code.google.com/p/msysgit/issues/detail?id=226
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-mergetool.txt | diffblobblamehistory | |
| Documentation/merge-config.txt | diffblobblamehistory | |
| git-mergetool.sh | diffblobblamehistory |