Merge branch 'aw/gc-lockfile-fscanf-fix'
[git] / mergetools / kompare
1 can_merge () {
2         return 1
3 }
4
5 diff_cmd () {
6         "$merge_tool_path" "$LOCAL" "$REMOTE"
7 }
8
9 exit_code_trustable () {
10         true
11 }