Code

Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into jn/svn-fe
[git.git] / mergetools / kompare
1 can_merge () {
2         return 1
3 }
5 diff_cmd () {
6         "$merge_tool_path" "$LOCAL" "$REMOTE"
7 }