summaryrefslogtreecommitdiff
path: root/mergetools/kompare
diff options
context:
space:
mode:
Diffstat (limited to 'mergetools/kompare')
-rw-r--r--mergetools/kompare7
1 files changed, 7 insertions, 0 deletions
diff --git a/mergetools/kompare b/mergetools/kompare
new file mode 100644
index 0000000000..433686c12a
--- /dev/null
+++ b/mergetools/kompare
@@ -0,0 +1,7 @@
+can_merge () {
+ return 1
+}
+
+diff_cmd () {
+ "$merge_tool_path" "$LOCAL" "$REMOTE"
+}