tests/test-merge-commit

--- a/tests/test-merge-commit	Mon Apr 16 20:17:39 2007 -0300
+++ b/tests/test-merge-commit	Mon Apr 16 20:17:39 2007 -0300
@@ -1,9 +1,6 @@
 #!/bin/sh
 # check that renames are correctly saved by a commit after a merge
 
-HGMERGE=merge
-export HGMERGE
-
 # test with the merge on 3 having the rename on the local parent
 hg init a
 cd a