Mercurial > hg

diff tests/test-conflict @ 4387: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-conflict	Thu Apr 26 23:58:18 2007 -0700
+++ b/tests/test-conflict	Sat Apr 28 17:55:45 2007 -0300
@@ -11,5 +11,5 @@
 hg commit -m branch2 -d "1000000 0"
 hg merge 1
 hg id
-egrep -v ">>>|<<<" a
+cat a
 hg status