Merge branch 'mm/mv-file-to-no-such-dir-with-slash' into maint

[git/gitweb.git] / mergetools / kompare

can_merge () {
        return 1
}

diff_cmd () {
        "$merge_tool_path" "$LOCAL" "$REMOTE"
}