Mercurial > public > mercurial-scm > hg

diff tests/test-merge-revert2 @ 4365:46280c004f22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change tests to use simplemerge by default
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 16 Apr 2007 20:17:39 -0300
parents 9dcf9d45cab8
children 93a4e72b4f83
line wrap: on
line diff
--- a/tests/test-merge-revert2	Mon Apr 16 20:17:39 2007 -0300
+++ b/tests/test-merge-revert2	Mon Apr 16 20:17:39 2007 -0300
@@ -26,7 +26,7 @@
 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