Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-conflict @ 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 e506c14382fd
children 93a4e72b4f83
line wrap: on
line diff
--- a/tests/test-conflict
+++ b/tests/test-conflict
@@ -9,7 +9,6 @@ hg commit -m branch1 -d "1000000 0"
 hg co 0
 echo "something else" > a
 hg commit -m branch2 -d "1000000 0"
-HGMERGE=merge; export HGMERGE
 hg merge 1
 hg id
 egrep -v ">>>|<<<" a