Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge7.out @ 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 17ed9b9a0d03
line wrap: on
line diff
--- a/tests/test-merge7.out
+++ b/tests/test-merge7.out
@@ -33,11 +33,11 @@ There are unresolved merges, you can red
   hg update -C 3
   hg merge 4
 one
-<<<<<<<
+<<<<<<< my
 two-point-five
 =======
 two-point-one
->>>>>>>
+>>>>>>> other
 three
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       7      0       0 01365c4cca56 000000000000 000000000000