Sync with 2.2.2

diff --git a/mergetools/kdiff3 b/mergetools/kdiff3
index 28fead428b333448566f480a434967fb7325c744..793d1293b16c9b28a9ec5c70ec7fa0875ab0da54 100644 (file)
--- a/mergetools/kdiff3
+++ b/mergetools/kdiff3
@@ -1,5 +1,5 @@
 diff_cmd () {
-       "$merge_tool_path" --auto \
+       "$merge_tool_path" \
                --L1 "$MERGED (A)" --L2 "$MERGED (B)" \
                "$LOCAL" "$REMOTE" >/dev/null 2>&1
 }
@@ -20,5 +20,4 @@ merge_cmd () {
                        -o "$MERGED" "$LOCAL" "$REMOTE" \
                >/dev/null 2>&1
        fi
-       status=$?
 }