tests/test-annotate

--- a/tests/test-annotate	Mon Apr 16 20:17:39 2007 -0300
+++ b/tests/test-annotate	Mon Apr 16 20:17:39 2007 -0300
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+HGMERGE=true; export HGMERGE
+
 echo % init
 hg init