Merge branch 'jn/make-assembly-in-right-directory' into maint

[git/mjg.git] / mergetools / kompare

can_merge () {
        return 1
}

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