tokkee.org
Code
projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
mergetool--lib: Refactor tools into separate files
[git.git]
/
mergetools
/
kompare
diff --git a/mergetools/kompare
b/mergetools/kompare
new file mode 100644
(file)
index 0000000..
433686c
--- /dev/null
+++ b/
mergetools/kompare
@@ -0,0
+1,7
@@
+can_merge () {
+ return 1
+}
+
+diff_cmd () {
+ "$merge_tool_path" "$LOCAL" "$REMOTE"
+}