As Ganesh noted in a comment to patch2358:

> Using "conflictedPaths" as the indicator of "are there any conflicts"
> seems standard in other places in the code, but it does feel a bit
> ugly. It doesn't seem intrinsic that a conflict has to be associated
> with some path

I agree so here is a ticket to remind us about looking into this.

The following patch sent by Ben Franksen <ben.franksen@online.de> updated issue issue2718 with
status=resolved;resolvedin=2.18.1

Hash: 2a82da8f0a29f0ec62e0b5aa7853f5a8886073ee
Author: Ben Franksen <ben.franksen@online.de>
* 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.