tests/test-merge-revert
changeset 4361 46280c004f22
parent 3988 9dcf9d45cab8
--- a/tests/test-merge-revert
+++ b/tests/test-merge-revert
@@ -25,7 +25,7 @@ hg status
 hg id
 hg update -C 0
 echo "changed file1" >> file1
-HGMERGE=merge hg update
+hg update
 hg diff
 hg status
 hg id