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