Merge branch 'jt/use-trailer-api-in-commands'

diff --git a/mergetools/xxdiff b/mergetools/xxdiff
index 05b443394ba166a82a22abfcf27865b4627405e2..e284811ff28563458e76b3f03f95bf9eb11fa726 100644 (file)
--- a/mergetools/xxdiff
+++ b/mergetools/xxdiff
@@ -6,7 +6,6 @@ diff_cmd () {
 }
 
 merge_cmd () {
-       touch "$BACKUP"
        if $base_present
        then
                "$merge_tool_path" -X --show-merged-pane \
@@ -21,5 +20,4 @@ merge_cmd () {
                        -R 'Accel.SearchForward: "Ctrl-G"' \
                        --merged-file "$MERGED" "$LOCAL" "$REMOTE"
        fi
-       check_unchanged
 }