Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
sequencer (rebase -i): allow rescheduling commands
[gitweb.git]
/
mergetools
/
bc
diff --git
a/mergetools/bc
b/mergetools/bc
index b6319d206e2333e42469486604d4635e846e5faa..3a69e60faa9c95dcf388cd295d040e9b88e0defd 100644
(file)
--- a/
mergetools/bc
+++ b/
mergetools/bc
@@
-3,7
+3,6
@@
diff_cmd () {
}
merge_cmd () {
- touch "$BACKUP"
if $base_present
then
"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
@@
-12,7
+11,6
@@
merge_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE" \
-mergeoutput="$MERGED"
fi
- check_unchanged
}
translate_merge_tool_path() {