This is an archive of the discontinued Mercurial Phabricator instance.

test-copies: introduce case combining the `p` and `q` branch

Authored by marmoute on Feb 22 2021, 9:35 AM.



That case involves conflicting copies information from each branch. It is
similar to the mAEm / mEAm case except this case actual content merge is
involved too.

Diff Detail

rHG Mercurial
Automatic diff as part of commit; lint not applicable.
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Feb 22 2021, 9:35 AM
baymax updated this revision to Diff 25774.Feb 22 2021, 11:34 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

This revision was not accepted when it landed; it landed in state Needs Review.
This revision was automatically updated to reflect the committed changes.