diff options
Diffstat (limited to 'mergetools/ecmerge')
| -rw-r--r-- | mergetools/ecmerge | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mergetools/ecmerge b/mergetools/ecmerge index 13c2e43..6c5101c 100644 --- a/mergetools/ecmerge +++ b/mergetools/ecmerge @@ -3,7 +3,6 @@ diff_cmd () { } merge_cmd () { - touch "$BACKUP" if $base_present then "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \ @@ -12,5 +11,4 @@ merge_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" \ --default --mode=merge2 --to="$MERGED" fi - check_unchanged } |