Mercurial > hg
comparison tests/test-merge7.t @ 46560:c7baff95808c
test-copies: add a case involving the `b` and a new `r` branch
That case involve a branch overwriting copies information from the other one.
It is similar to the `mBFm` / `mFBm` case except this case actual content merge
is involved too.
Differential Revision: https://phab.mercurial-scm.org/D10058
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 22 Feb 2021 11:56:58 +0100 |
parents | 69429972ff1f |
children | 38941a28406a |
comparison
equal
deleted
inserted
replaced
46559:a1273bea99cc | 46560:c7baff95808c |
---|