--- a/tests/test-merge-revert2
+++ b/tests/test-merge-revert2
@@ -26,7 +26,7 @@ hg status
hg id
hg update -C 0
echo "changed file1 different" >> file1
-HGMERGE=merge hg update
+hg update
hg diff --nodates | sed -e "s/\(<<<<<<<\) .*/\1/" -e "s/\(>>>>>>>\) .*/\1/"
hg status
hg id