diff options
Diffstat (limited to 'mergetools/codecompare')
| -rw-r--r-- | mergetools/codecompare | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mergetools/codecompare b/mergetools/codecompare index 3f0486b..9f60e8d 100644 --- a/mergetools/codecompare +++ b/mergetools/codecompare @@ -3,7 +3,6 @@ diff_cmd () { } merge_cmd () { - touch "$BACKUP" if $base_present then "$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" -BF="$BASE" \ @@ -12,7 +11,6 @@ merge_cmd () { "$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" \ -RF="$MERGED" fi - check_unchanged } translate_merge_tool_path() { |