Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
remote: force completing --mirror= instead of --mirror
[gitweb.git]
/
mergetools
/
vimdiff
diff --git
a/mergetools/vimdiff
b/mergetools/vimdiff
index a841ffdb492dd9bdbd7a65238786fff44684d20b..10d86f3e19304125cecf06ddad928b9ffe2d0c08 100644
(file)
--- a/
mergetools/vimdiff
+++ b/
mergetools/vimdiff
@@
-42,3
+42,7
@@
translate_merge_tool_path() {
;;
esac
}
+
+exit_code_trustable () {
+ true
+}