| commit | 57d87482147e062ac1024f293f513a2400825fcb | |
| author | Markus Heidelberg <markus.heidelberg@web.de> | |
| Sun, 5 Apr 2009 12:43:27 +0000 (5 14:43 +0200) | ||
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Sun, 5 Apr 2009 13:21:27 +0000 (5 15:21 +0200) | ||
| tree | e6ac3a931b6e383660fe64544cf0b4bab3532244 | treesnapshot (tar.gz zip) |
| parent | 1fadfbe9b6df8f5e8733741986003f08ba9df2df | 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>
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>
| Documentation/git-mergetool.txt | diffblobblamehistory | |
| Documentation/merge-config.txt | diffblobblamehistory | |
| git-mergetool.sh | diffblobblamehistory |