diff mercurial/rcutil.py @ 45343:e3826f1dab60

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
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 05 Aug 2020 14:03:59 +0530
parents 238790674d69
children 89a2afe31e82
line wrap: on
line diff