HomePhabricator

copies-tests: add a case where with merge with an overwritten files

Authored by marmoute.

Description

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