diff 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

--- a/tests/test-fastannotate.t	Thu Apr 18 03:05:42 2019 +0530
+++ b/tests/test-fastannotate.t	Sun Apr 14 13:46:40 2019 -0700
@@ -3,8 +3,6 @@
   > fastannotate=
   > EOF
 
-  $ HGMERGE=true; export HGMERGE
-
   $ hg init repo
   $ cd repo