Merge branch 'jk/xdiff-drop-xdl-fast-hash'

diff --git a/mergetools/tortoisemerge b/mergetools/tortoisemerge
index 8476afa66e458f2a0906ca3bcfa976e33414223a..d7ab666a59a2c8690861146bb6ae4874ed48e0de 100644 (file)
--- a/mergetools/tortoisemerge
+++ b/mergetools/tortoisemerge
@@ -5,11 +5,17 @@ can_diff () {
 merge_cmd () {
        if $base_present
        then
-               touch "$BACKUP"
-               "$merge_tool_path" \
-                       -base:"$BASE" -mine:"$LOCAL" \
-                       -theirs:"$REMOTE" -merged:"$MERGED"
-               check_unchanged
+               basename="$(basename "$merge_tool_path" .exe)"
+               if test "$basename" = "tortoisegitmerge"
+               then
+                       "$merge_tool_path" \
+                               -base "$BASE" -mine "$LOCAL" \
+                               -theirs "$REMOTE" -merged "$MERGED"
+               else
+                       "$merge_tool_path" \
+                               -base:"$BASE" -mine:"$LOCAL" \
+                               -theirs:"$REMOTE" -merged:"$MERGED"
+               fi
        else
                echo "$merge_tool_path cannot be used without a base" 1>&2
                return 1