comparison tests/test-diff-issue2761.t @ 48153:c29d312657d2

dirstate-item: drop the `merged` property It has no user anymore. Differential Revision: https://phab.mercurial-scm.org/D11597
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 01 Oct 2021 03:30:00 +0200
parents 73e3e368bd42
children 55c6ebd11cb9
comparison
equal deleted inserted replaced
48152:8f88307f8e07 48153:c29d312657d2