Mercurial > hg
comparison mercurial/state.py @ 48710:b0aa9b0b9c21
convert: use the merge action constant
The constant exists, lets use them. Otherwise we cannot make these constant more
powerful.
Differential Revision: https://phab.mercurial-scm.org/D12113
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 28 Jan 2022 16:25:41 +0100 |
parents | f38bf44e077f |
children | 6000f5b25c9b |
comparison
equal
deleted
inserted
replaced
48709:d536d4afe003 | 48710:b0aa9b0b9c21 |
---|