Several updates and additions to unit tests / properties, some of which
follow up review for "[patch1826] v3: resolve conflicts".

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

patch 84368c8691d34facbcfa2b091a10ac825f8cc082
Author: Ben Franksen <ben.franksen@online.de>
Date:   Mon Jul  8 18:08:51 CEST 2019
  * harness: optimize prop_betweenLinesPS

patch c9d13f93f532b656ff5295c1b4d0c6f7492ed3f2
Author: Ben Franksen <ben.franksen@online.de>
Date:   Mon Jun 24 12:12:01 CEST 2019
  * v3: add an important conflictor property

patch 73775adfdeb239fd23fe6a8df6bc497601976c77
Author: Ben Franksen <ben.franksen@online.de>
Date:   Wed Jul 10 19:43:41 CEST 2019
  * add two properties about conflict resolution and test them
  
  This required adding a utility function permutationsRL and factoring out
  mergeList from D.R.Resolution into D.P.CommuteNoConflicts.

patch 6ca5f802f7f2cd1fc35a45ccc712dfb248966dd0
Author: Ben Franksen <ben.franksen@online.de>
Date:   Tue Jul 16 17:34:00 CEST 2019
  * fix v3 repo property prop_conflictsCommutePastConflictor
  
  The property as stated before didn't take conflict resolutions into account,
  that is, parts of a conflict could be resolved by recording a patch that
  depends on that part. In this case we can only commute the conflicted part
  past the conflictor if we drag the resolution with us.

patch 695bc13d606c4fbec0c8ce75b992f19ac75db36d
Author: Ben Franksen <ben.franksen@online.de>
Date:   Tue Jul 16 22:04:52 CEST 2019
  * harness: test prop_ctxEq

patch 529ad8d5f386d7253178580a86a74512b48ccb15
Author: Ben Franksen <ben.franksen@online.de>
Date:   Tue Jul 16 22:16:07 CEST 2019
  * harness: remove code I commented out but kept as a reminder
  
  The test in question has meanwhile been added as a generic property.

Attachments

• harness_-optimize-prop_betweenlinesps.dpatch
• patch-preview.txt
• unnamed

All fine