Squashed 'third_party/git/' content from commit cb71568594

git-subtree-dir: third_party/git
git-subtree-split: cb715685942260375e1eb8153b0768a376e4ece7

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
+}