Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge-revert2 @ 4385:93a4e72b4f83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests.py: pass -L/--label to simplemerge This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 28 Apr 2007 17:55:45 -0300
parents 46280c004f22
children
line wrap: on
line diff
--- a/tests/test-merge-revert2
+++ b/tests/test-merge-revert2
@@ -27,7 +27,7 @@ hg id
 hg update -C 0
 echo "changed file1 different" >> file1
 hg update
-hg diff --nodates | sed -e "s/\(<<<<<<<\) .*/\1/" -e "s/\(>>>>>>>\) .*/\1/"
+hg diff --nodates
 hg status
 hg id
 hg revert --no-backup --all