tag: respect `pager.tag` in list-mode only
[gitweb.git] / mergetools / kdiff3
index a30034f116fda6f90448aeb4ddd42063ea60aad1..0264ed5b20b29fec0fc5586408f88b0e8755d212 100644 (file)
@@ -20,5 +20,8 @@ merge_cmd () {
                        -o "$MERGED" "$LOCAL" "$REMOTE" \
                >/dev/null 2>&1
        fi
-       status=$?
+}
+
+exit_code_trustable () {
+       true
 }