summaryrefslogtreecommitdiff
path: root/mergetools/kompare
diff options
context:
space:
mode:
Diffstat (limited to 'mergetools/kompare')
-rw-r--r--mergetools/kompare4
1 files changed, 4 insertions, 0 deletions
diff --git a/mergetools/kompare b/mergetools/kompare
index 433686c12a..e8c0bfa678 100644
--- a/mergetools/kompare
+++ b/mergetools/kompare
@@ -5,3 +5,7 @@ can_merge () {
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE"
}
+
+exit_code_trustable () {
+ true
+}