about summary refs log tree commit diff
path: root/mergetools/kompare
diff options
context:
space:
mode:
authorVincent Ambo <Vincent Ambo>2020-01-11T23·36+0000
committerVincent Ambo <Vincent Ambo>2020-01-11T23·36+0000
commit1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5 (patch)
treee3accb9beed5c4c1b5a05c99db71ab2841f0ed04 /mergetools/kompare
Squashed 'third_party/git/' content from commit cb71568594
git-subtree-dir: third_party/git
git-subtree-split: cb715685942260375e1eb8153b0768a376e4ece7
Diffstat (limited to 'mergetools/kompare')
-rw-r--r--mergetools/kompare11
1 files changed, 11 insertions, 0 deletions
diff --git a/mergetools/kompare b/mergetools/kompare
new file mode 100644
index 000000000000..e8c0bfa67854
--- /dev/null
+++ b/mergetools/kompare
@@ -0,0 +1,11 @@
+can_merge () {
+	return 1
+}
+
+diff_cmd () {
+	"$merge_tool_path" "$LOCAL" "$REMOTE"
+}
+
+exit_code_trustable () {
+	true
+}