merge: use ACTION_* constants instead of values in _filternarrowactions()...
merge: use ACTION_* constants instead of values in _filternarrowactions()
It makes easier to check what noconflicttypes are and which are not included.
I hope we can have a state where we always use ACTION_* constants instead of
these values which are very hard to understand.
Differential Revision:
https://phab.mercurial-scm.org/D8885