annotate mercurial/thirdparty/zope/__init__.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 338367d44d34
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source