Darcs 2.0.2 (+ 5 patches) works, and marks the conflicts
successfully in the old-format repository. After I convert the
repository to darcs-2 format, there are no longer any conflicts
to mark. I think they disappear during the lossy conversion of
complicated conflicts. |