Code

Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb5230361c64946232cc346'
[git.git] / mergetools / kompare
1 can_merge () {
2         return 1
3 }
5 diff_cmd () {
6         "$merge_tool_path" "$LOCAL" "$REMOTE"
7 }