projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5d41784) | patch
mergetools: support TortoiseGitMerge
authorSven Strickroth <sven.strickroth@tu-clausthal.de>
Sat, 26 Jan 2013 01:15:57 +0000 (02:15 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sun, 27 Jan 2013 03:01:46 +0000 (19:01 -0800)
commit8bf671946da23b39b7b6b18fe99cfa011ec21a11
treec76837ccc67e71260cc621e6776bdcff9b512a14tree | snapshot
parent5d417842efeafb6e109db7574196901c4e95d273commit | diff
mergetools: support TortoiseGitMerge

TortoiseMerge.exe was ben renamed to TortoiseGitMerge.exe (starting
with 1.8.0) in order to make it clear that it has special support
for git, and prevent confusion with the TortoiseSVN TortoiseMerge
version.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
mergetools/tortoisemerge diff | blob | history
Git—the stupid content tracker