Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
sequencer: remove the 'arg' field from todo_item
[gitweb.git]
/
mergetools
/
ecmerge
diff --git
a/mergetools/ecmerge
b/mergetools/ecmerge
index 13c2e439def45fe6cf58ae4345355894463ba34f..6c5101c4f729d49c544436e9262ca75e4ce6cddd 100644
(file)
--- 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
}