Skip to content
Snippets Groups Projects
Commit de37d662ed17 authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

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

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.

Differential Revision: https://phab.mercurial-scm.org/D10057
parent 67f11d691fc6
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment