From: Kai <github@kai-annacker.de>
Date: Fri, 16 Mar 2018 09:59:12 GMT
Subject: [PATCH] mergetools: enable tortoisemerge as difftool
Message-ID: <010201622e3fc0a8-2804475a-8c37-4978-b5dd-b0fb254bfed2-000000@eu-west-1.amazonses.com>

TortoiseMerge/TortoiseGitMerge can also be used to view and edit file differences.

This change allows configuring tortoisemerge not only as mergetool but as difftool as well.
---
 mergetools/tortoisemerge | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/mergetools/tortoisemerge b/mergetools/tortoisemerge
index d7ab666a59a2c..d3dcec1407f2d 100644
--- a/mergetools/tortoisemerge
+++ b/mergetools/tortoisemerge
@@ -1,5 +1,13 @@
-can_diff () {
-	return 1
+diff_cmd () {
+	basename="$(basename "$merge_tool_path" .exe)"
+	if test "$basename" = "tortoisegitmerge"
+	then
+		"$merge_tool_path" \
+			-mine "$REMOTE" -base "$LOCAL"
+	else
+		"$merge_tool_path" \
+			-mine:"$REMOTE" -base:"$LOCAL"
+	fi
 }
 
 merge_cmd () {

--
https://github.com/git/git/pull/471