Fourth batch

diff --git a/mergetools/diffmerge b/mergetools/diffmerge
index 85ac7201571ed34c35a3613b97bd1b82982e0d61..9b6355b98a71da2627b68c6543cea4f2515b8d54 100644 (file)
--- a/mergetools/diffmerge
+++ b/mergetools/diffmerge
@@ -11,5 +11,8 @@ merge_cmd () {
                "$merge_tool_path" --merge \
                        --result="$MERGED" "$LOCAL" "$REMOTE"
        fi
-       status=$?
+}
+
+exit_code_trustable () {
+       true
 }