comparison hgext/keyword.py @ 48151:e0b4e4f80fff

dirstate-item: replace a `merged` usage with `p2_info` It seems more accurate and no test complains (XXX hopefully XXX). Differential Revision: https://phab.mercurial-scm.org/D11595
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 01 Oct 2021 03:28:01 +0200
parents b9086ec4d28b
children 4237be881bb6
comparison
equal deleted inserted replaced
48150:d71feb05d5b6 48151:e0b4e4f80fff