Mercurial > hg
view tests/test-fastannotate-diffopts.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 | 1ddb296e0dee |
children |
line wrap: on
line source
$ cat >> $HGRCPATH << EOF > [extensions] > fastannotate= > EOF $ hg init repo $ cd repo changes to whitespaces $ cat >> a << EOF > 1 > > > 2 > EOF $ hg commit -qAm '1' $ cat > a << EOF > 1 > > 2 > > > 3 > EOF $ hg commit -m 2 $ hg fastannotate -wB a 0: 1 0: 1: 2 0: 1: 1: 3