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>
Sven Strickroth committed
Jan 26, 2013 at 02:15 UTC
8bf671946da23b39b7b6b18fe99cfa011ec21a11
1 file changed
+10
-1
mergetools/tortoisemerge
+10
-1
@@ -11,7 +11,16 @@ merge_cmd () {
11
-theirs:"$REMOTE" -merged:"$MERGED"
12
check_unchanged
13
else
14
- echo "TortoiseMerge cannot be used without a base" 1>&2
14
+ echo "$merge_tool_path cannot be used without a base" 1>&2
15
return 1
16
fi
17
}
18
+
19
+translate_merge_tool_path() {
20
+ if type tortoisegitmerge >/dev/null 2>/dev/null
21
+ then
22
+ echo tortoisegitmerge
23
+ else
24
+ echo tortoisemerge
25
+ fi
26
+}