Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint-1.8.1
[git] / mergetools / kompare
1 can_merge () {
2         return 1
3 }
4
5 diff_cmd () {
6         "$merge_tool_path" "$LOCAL" "$REMOTE"
7 }