comparison contrib/hgclient.py @ 46563:c19c662097e1

copies: detect case when a merge decision overwrite previous data We now detect and record when a merge case required special logic (eg: thing that append during the merge, ambiguity leading to picking p1 data, etc) and we explicitly mark the result as superseding the previous data. This fixes the family of test we previously added. Differential Revision: https://phab.mercurial-scm.org/D9613
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 12 Dec 2020 19:35:08 +0100
parents 9f70512ae2cf
children 6000f5b25c9b
comparison
equal deleted inserted replaced
46562:c692384bb559 46563:c19c662097e1