Perhaps this should be a warning rather than an error. I.e. we can just continue with the merge without the quilt patch handling.
Perhaps this should be a warning rather than an error. I.e. we can just continue with the merge without the quilt patch handling.