Merge branch 'mh/fast-import-notes-fix-new' into maint

[git] / mergetools / deltawalker

diff --git a/mergetools/deltawalker b/mergetools/deltawalker
index b3c71b6..ee6f374 100644 (file)
--- a/mergetools/deltawalker
+++ b/mergetools/deltawalker
@@ -16,6 +16,10 @@ merge_cmd () {
        fi >/dev/null 2>&1
 }
 
-translate_merge_tool_path() {
+translate_merge_tool_path () {
        echo DeltaWalker
 }
+
+exit_code_trustable () {
+       true
+}