Mercurial > hg
comparison tests/test-archive.t @ 44459:6f1f4a6f4168
copies-tests: add a case where a file is deleted/added but with a merge
This is a case similar to DB/BD, 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/D8241
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 03 Mar 2020 15:46:28 +0100 |
parents | 21e05aabef8c |
children | 862025f108c7 |
comparison
equal
deleted
inserted
replaced
44458:890def17d03b | 44459:6f1f4a6f4168 |
---|