summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorSven Strickroth <sven.strickroth@tu-clausthal.de>2013-01-26 02:15:57 +0100
committerJunio C Hamano <gitster@pobox.com>2013-01-26 19:01:46 -0800
commit8bf671946da23b39b7b6b18fe99cfa011ec21a11 (patch)
treec76837ccc67e71260cc621e6776bdcff9b512a14 /mergetools
parent5d417842efeafb6e109db7574196901c4e95d273 (diff)
downloadgit-8bf671946da23b39b7b6b18fe99cfa011ec21a11.tar.gz
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>
Diffstat (limited to 'mergetools')
-rw-r--r--mergetools/tortoisemerge11
1 files changed, 10 insertions, 1 deletions
diff --git a/mergetools/tortoisemerge b/mergetools/tortoisemerge
index ed7db495ed..8476afa66e 100644
--- a/mergetools/tortoisemerge
+++ b/mergetools/tortoisemerge
@@ -11,7 +11,16 @@ merge_cmd () {
-theirs:"$REMOTE" -merged:"$MERGED"
check_unchanged
else
- echo "TortoiseMerge cannot be used without a base" 1>&2
+ echo "$merge_tool_path cannot be used without a base" 1>&2
return 1
fi
}
+
+translate_merge_tool_path() {
+ if type tortoisegitmerge >/dev/null 2>/dev/null
+ then
+ echo tortoisegitmerge
+ else
+ echo tortoisemerge
+ fi
+}