comparison tests/fakemergerecord.py @ 48152:8f88307f8e07

dirstate-item: replace another usage of `merged` We simply spell out the logic here. This was the last usage of `merged`. Differential Revision: https://phab.mercurial-scm.org/D11596
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 01 Oct 2021 03:29:33 +0200
parents b7808443ed6a
children 6000f5b25c9b
comparison
equal deleted inserted replaced
48151:e0b4e4f80fff 48152:8f88307f8e07