diff options
Diffstat (limited to 'mergetools/kompare')
-rw-r--r-- | mergetools/kompare | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/mergetools/kompare b/mergetools/kompare new file mode 100644 index 0000000..4ce23db --- /dev/null +++ b/mergetools/kompare @@ -0,0 +1,19 @@ +can_merge () { + return 1 +} + +diff_cmd_help () { + echo "Use Kompare (requires a graphical session)" +} + +diff_cmd () { + "$merge_tool_path" "$LOCAL" "$REMOTE" +} + +merge_cmd_help () { + echo "Use Kompare (requires a graphical session)" +} + +exit_code_trustable () { + true +} |