Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11
[git] / mergetools / kompare
1 can_merge () {
2         return 1
3 }
4
5 diff_cmd () {
6         "$merge_tool_path" "$LOCAL" "$REMOTE"
7 }