{"thread":{"id":"48055","subject":"[PATCH] mergetools: enable tortoisemerge as difftool","startedAt":"2018-03-16T09:59:18Z","lastAt":"2018-03-16T09:59:18Z","messageCount":1,"participants":["Kai"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"341863","messageId":"010201622e3fc0a8-2804475a-8c37-4978-b5dd-b0fb254bfed2-000000@eu-west-1.amazonses.com","threadId":"48055","inReplyTo":null,"subject":"[PATCH] mergetools: enable tortoisemerge as difftool","fromName":"Kai","fromEmail":"github@kai-annacker.de","sentAt":"2018-03-16T09:59:12Z","receivedAt":"2018-03-16T09:59:18Z","isPatch":true,"sender":{"key":"github@kai-annacker.de","avatar":null},"body":"TortoiseMerge/TortoiseGitMerge can also be used to view and edit file differences.\n\nThis change allows configuring tortoisemerge not only as mergetool but as difftool as well.\n---\n mergetools/tortoisemerge | 12 ++++++++++--\n 1 file changed, 10 insertions(+), 2 deletions(-)\n\ndiff --git a/mergetools/tortoisemerge b/mergetools/tortoisemerge\nindex d7ab666a59a2c..d3dcec1407f2d 100644\n--- a/mergetools/tortoisemerge\n+++ b/mergetools/tortoisemerge\n@@ -1,5 +1,13 @@\n-can_diff () {\n-\treturn 1\n+diff_cmd () {\n+\tbasename=\"$(basename \"$merge_tool_path\" .exe)\"\n+\tif test \"$basename\" = \"tortoisegitmerge\"\n+\tthen\n+\t\t\"$merge_tool_path\" \\\n+\t\t\t-mine \"$REMOTE\" -base \"$LOCAL\"\n+\telse\n+\t\t\"$merge_tool_path\" \\\n+\t\t\t-mine:\"$REMOTE\" -base:\"$LOCAL\"\n+\tfi\n }\n \n merge_cmd () {\n\n--\nhttps://github.com/git/git/pull/471\n"}]}