mergetools / kompareon commit Merge branch 'pm/build-persistent-https-with-recent-go' into maint (d1d9c3c)
   1can_merge () {
   2        return 1
   3}
   4
   5diff_cmd () {
   6        "$merge_tool_path" "$LOCAL" "$REMOTE"
   7}