I think I may have failed to send these patches, they were not in screened
and I have accidentally pushed them to reviewed. I just obliterated them
from reviewed. Sorry for the mess.

2 patches for repository http://darcs.net/screened:

patch 9b0829c6113fb002675d42120a47b106f0b58584
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu May 21 10:19:25 CEST 2020
  * use mergerFLFL in instance Merge (FL p)

patch 32da7bf3481dfe70c962e3553be591c62fb424e1
Author: Ben Franksen <ben.franksen@online.de>
Date:   Thu May 21 10:20:54 CEST 2020
  * fix convert darcs2 test data after patch 9b0829c6113f
  
  This accounts for the fact that the on-disk format of V2 conflictors does
  not order the conflicting patches. This order is different now because the
  new definition merge for FLs merges in a different order.

Attachments

• patch-preview.txt
• unnamed
• use-mergerflfl-in-instance-merge-_fl-p_.dpatch

OK