Merge branch 'jc/daemon-no-ipv6-for-2.4.1' into maint

[git/git-svn.git] / mergetools / kompare

can_merge () {
        return 1
}

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