Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge-revert @ 4361: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
line wrap: on
line diff
--- 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