1 patch for repository /home/franksen/src/darcs/reviewed:
patch 2a82da8f0a29f0ec62e0b5aa7853f5a8886073ee
Author: Ben Franksen <ben.franksen@online.de>
Date: Fri May 10 15:02:08 CEST 2024
* resolve issue2718: avoid using conflictedPaths to detect whether we have conflicts
This adds an explicit test named haveConflicts, which looks at the "sum" of
the mangled and unmangled conflicts. This is cleaner because in principle
(albeit not in practice) there could be conflicts that do not involve any
file paths. Consequently, the warning message for conflicts is now separate
from the listing of the affected paths.