--- a/tests/test-merge-default Thu Mar 11 16:54:34 2010 -0600
+++ b/tests/test-merge-default Mon Mar 08 03:07:35 2010 +0100
@@ -24,7 +24,7 @@
hg up
echo % should fail because \> 2 heads
-export HGMERGE=internal:other
+HGMERGE=internal:other; export HGMERGE
hg merge
echo % should succeed