Merge branch 'tb/clone-ssh-with-colon-for-port' into maint

[git/mingw/4msysgit.git] / mergetools / kompare

can_merge () {
        return 1
}

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