Mercurial > hg
comparison tests/test-fastannotate.t @ 42151:7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
We were using `true` as merge tool. I think it makes the test easier
to understand if we make the conflicts explcit. It also papered over a
conflict that shouldn't have been a conflict (just a bug in copy
tracing). I've marked that "BROKEN".
Differential Revision: https://phab.mercurial-scm.org/D6252
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Sun, 14 Apr 2019 13:46:40 -0700 |
| parents | 1ddb296e0dee |
| children | 9c9e0b4b2ca7 |
comparison
equal
deleted
inserted
replaced
| 42150:770f5f586ae5 | 42151:7116fc614cfc |
|---|---|
| 1 $ cat >> $HGRCPATH << EOF | 1 $ cat >> $HGRCPATH << EOF |
| 2 > [extensions] | 2 > [extensions] |
| 3 > fastannotate= | 3 > fastannotate= |
| 4 > EOF | 4 > EOF |
| 5 | |
| 6 $ HGMERGE=true; export HGMERGE | |
| 7 | 5 |
| 8 $ hg init repo | 6 $ hg init repo |
| 9 $ cd repo | 7 $ cd repo |
| 10 | 8 |
| 11 a simple merge case | 9 a simple merge case |