mergetools: support TortoiseGitMerge

diff --git a/mergetools/tortoisemerge b/mergetools/tortoisemerge
index ed7db495eda9b70bee7e077a0de07d30518cbf2a..8476afa66e458f2a0906ca3bcfa976e33414223a 100644 (file)
--- 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
+}