mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult...
mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult
This makes sure it isn't intended to be overridden by subclasses.
Thanks to Yuya for the nice suggestion.
Differential Revision:
https://phab.mercurial-scm.org/D9025