--- 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