darcs

Message5249

Author tommy
Recipients beschmi, dagit, droundy, kowey, markstos, ngoldberg, tommy
Date 2008-07-24.13:50:00
Issue Issue221 mark-conflicts => Problem resolving conflicts in resolve! (1.0.9)
Content
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.
History
Date User Action Args
2008-07-24 13:50:00tommycreate
2008-07-24 13:50:04tommylinkissue221 messages
2008-07-24 13:50:04tommysetmessageid: <1216907404.45.0.787464619795.issue221@darcs.net>
2008-07-24 13:50:04tommysetrecipients: + tommy, droundy, beschmi, kowey, markstos, dagit, ngoldberg