Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'mh/reflog-expire'
[gitweb.git]
/
mergetools
/
emerge
diff --git
a/mergetools/emerge
b/mergetools/emerge
index f96d9e550a138d395ccb23c9496111630d2de594..7b895fdb1f9955eb470a2614e0634bfcd26d90c9 100644
(file)
--- a/
mergetools/emerge
+++ b/
mergetools/emerge
@@
-15,7
+15,6
@@
merge_cmd () {
"$LOCAL" "$REMOTE" \
"$(basename "$MERGED")"
fi
- status=$?
}
translate_merge_tool_path() {