Code

Merge branch 'maint-1.7.6' into maint-1.7.7
[git.git] / mergetools / kompare
1 can_merge () {
2         return 1
3 }
5 diff_cmd () {
6         "$merge_tool_path" "$LOCAL" "$REMOTE"
7 }