Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'kh/tutorial-grammofix' into maint
[gitweb.git]
/
mergetools
/
araxis
diff --git
a/mergetools/araxis
b/mergetools/araxis
index 64f97c5e9755d54ace864cb53bf0e7844f530f49..e2407b65b70d1e622979cdb2fe0e425ba6403ee1 100644
(file)
--- 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() {