Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
fast-export: move commit rewriting logic into a function for reuse
[gitweb.git]
/
mergetools
/
kdiff3
diff --git
a/mergetools/kdiff3
b/mergetools/kdiff3
index 793d1293b16c9b28a9ec5c70ec7fa0875ab0da54..0264ed5b20b29fec0fc5586408f88b0e8755d212 100644
(file)
--- a/
mergetools/kdiff3
+++ b/
mergetools/kdiff3
@@
-21,3
+21,7
@@
merge_cmd () {
>/dev/null 2>&1
fi
}
+
+exit_code_trustable () {
+ true
+}