Merge branch 'jc/pack-bitmap-unaligned' into maint

[thirdparty/git.git] / mergetools / kompare

can_merge () {
        return 1
}

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

exit_code_trustable () {
        true
}