Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line'

[git] / mergetools / kompare

can_merge () {
        return 1
}

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