mergetools / kompareon commit Merge branch 'jc/maint-commit-ignore-i-t-a' into maint (6c63ab3)
   1can_merge () {
   2        return 1
   3}
   4
   5diff_cmd () {
   6        "$merge_tool_path" "$LOCAL" "$REMOTE"
   7}