diff mercurial/ui.py @ 45525:590a840fa367

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
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 16 Sep 2020 18:09:32 +0530
parents 02b17231f6c3
children 14ac6a74e7e7 ed84a4d48910
line wrap: on
line diff