Mercurial > hg
view tests/test-revlog-raw.py.out @ 44460:c8fd21413458
copies-tests: add a case where with merge with an overwritten files
This is similar to the BF/FB case, but in this case, the other branch updated
the file. So an actual merge happens and the two "independant" file history has
to be merged.
Differential Revision: https://phab.mercurial-scm.org/D8242
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 03 Mar 2020 15:56:00 +0100 |
parents | 797a416a91bd |
children |
line wrap: on
line source
local test passed addgroupcopy test passed clone test passed lowlevelcopy test passed slicing test passed issnapshot test passed findsnapshot test passed