diff options
Diffstat (limited to 'mergetools/xxdiff')
| -rw-r--r-- | mergetools/xxdiff | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mergetools/xxdiff b/mergetools/xxdiff index 05b4433..e284811 100644 --- 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 } |