Merge branch 'xz/send-email-batch-size'

diff --git a/mergetools/meld b/mergetools/meld
index 83ebdfb4c328ac79af38bfe935f0dbfa7fb6f53b..7a08470f8836e14824a215b29e0c3a5dbeba9c17 100644 (file)
--- a/mergetools/meld
+++ b/mergetools/meld
@@ -7,15 +7,14 @@ merge_cmd () {
        then
                check_meld_for_output_version
        fi
-       touch "$BACKUP"
+
        if test "$meld_has_output_option" = true
        then
-               "$merge_tool_path" --output "$MERGED" \
+               "$merge_tool_path" --output="$MERGED" \
                        "$LOCAL" "$BASE" "$REMOTE"
        else
                "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
        fi
-       check_unchanged
 }
 
 # Check whether we should use 'meld --output <file>'