mergetools / kompareon commit Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maint (85785df)
   1can_merge () {
   2        return 1
   3}
   4
   5diff_cmd () {
   6        "$merge_tool_path" "$LOCAL" "$REMOTE"
   7}