diff options
Diffstat (limited to 'mergetools/araxis')
| -rw-r--r-- | mergetools/araxis | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mergetools/araxis b/mergetools/araxis index 64f97c5e9..e2407b65b 100644 --- a/mergetools/araxis +++ b/mergetools/araxis @@ -3,7 +3,6 @@ diff_cmd () { } merge_cmd () { - touch "$BACKUP" if $base_present then "$merge_tool_path" -wait -merge -3 -a1 \ @@ -12,7 +11,6 @@ merge_cmd () { "$merge_tool_path" -wait -2 \ "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1 fi - check_unchanged } translate_merge_tool_path() { |