D8041: revset: add a revset for parents in merge state

[marmoute (Pierre-Yves David)]

marmoute added inline comments.

INLINE COMMENTS

> next:3
>  
> + * New `conflictparents()` revset returns the commits that are being
> +   merged, when there are conflicts. Also works for conflicts caused

Could we call this `conflict_sides`, using "parents" for things that are not actual parent might be confusing.

What about having a  `local_conflict_side` and `other_conflict_side` `conflict_base` revsets ?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8041/new/

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

To: martinvonz, #hg-reviewers
Cc: marmoute, yuja, pulkit, mjpieters, mercurial-devel