Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
completion: restore removed line continuating backslash
[gitweb.git]
/
mergetools
/
emerge
diff --git
a/mergetools/emerge
b/mergetools/emerge
index 7b895fdb1f9955eb470a2614e0634bfcd26d90c9..d1ce513ff5d3b3db14dd1270d2181099e1134c2c 100644
(file)
--- a/
mergetools/emerge
+++ b/
mergetools/emerge
@@
-20,3
+20,7
@@
merge_cmd () {
translate_merge_tool_path() {
echo emacs
}
+
+exit_code_trustable () {
+ true
+}