D774: merge: add pathconflict merge state

[kiilerix (Mads Kiilerich)]

kiilerix added inline comments.

INLINE COMMENTS

> merge.py:88
> +    pr: resolved path conflict
> +    d: driver-resolved conflict
>      '''

Some of this is adding documentation for existing functionality? It could be nice to have this changeset show exactly what it is adding.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D774

To: mbthomas, #hg-reviewers, ryanmce
Cc: kiilerix, ryanmce, mercurial-devel