--- a/tests/test-merge-revert Mon Apr 16 20:17:39 2007 -0300
+++ b/tests/test-merge-revert Mon Apr 16 20:17:39 2007 -0300
@@ -25,7 +25,7 @@
hg id
hg update -C 0
echo "changed file1" >> file1
-HGMERGE=merge hg update
+hg update
hg diff
hg status
hg id