lockfile: rename LOCK_NODEREF to LOCK_NO_DEREF

[git/debian.git] / mergetools / kompare

can_merge () {
        return 1
}

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