Merge branch 'cs/http-use-basic-after-failed-negotiate'
[alt-git.git] / mergetools / kompare
blobe8c0bfa678547258ff0f330ae756f3621e6aadc7
1 can_merge () {
2         return 1
5 diff_cmd () {
6         "$merge_tool_path" "$LOCAL" "$REMOTE"
9 exit_code_trustable () {
10         true