Merge branch 'ld/p4-compare-dir-vs-symlink' into maint

[git] / mergetools / kdiff3

diff --git a/mergetools/kdiff3 b/mergetools/kdiff3
index 793d129..0264ed5 100644 (file)
--- a/mergetools/kdiff3
+++ b/mergetools/kdiff3
@@ -21,3 +21,7 @@ merge_cmd () {
                >/dev/null 2>&1
        fi
 }
+
+exit_code_trustable () {
+       true
+}