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