sequencer: remove the 'arg' field from todo_item

diff --git a/mergetools/xxdiff b/mergetools/xxdiff
index cc3b2f0e3164c7d49af852153599ae6b133387f1..ce5b8e9f296233470d18feae929772235e4f12f2 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
 }