Merge branch 'kd/pull-rebase-autostash'
[git] / mergetools / kompare
CommitLineData
bc7a96a8
DA
1can_merge () {
2 return 1
3}
4
5diff_cmd () {
6 "$merge_tool_path" "$LOCAL" "$REMOTE"
7}