From: Sven Strickroth <sven.strickroth@tu-clausthal.de>
Date: Sat, 26 Jan 2013 01:15:57 +0000 (+0100)
Subject: mergetools: support TortoiseGitMerge
X-Git-Tag: v1.8.2-rc0~39^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8bf671946da23b39b7b6b18fe99cfa011ec21a11?hp=--cc

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>
---

8bf671946da23b39b7b6b18fe99cfa011ec21a11
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
+}