Mercurial > hg
comparison tests/test-conflict.out @ 4387:93a4e72b4f83
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 | 5af5f0f9d724 |
comparison
equal
deleted
inserted
replaced
| 4386:1386a9cffc88 | 4387:93a4e72b4f83 |
|---|---|
| 5 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 5 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 6 There are unresolved merges, you can redo the full merge using: | 6 There are unresolved merges, you can redo the full merge using: |
| 7 hg update -C 2 | 7 hg update -C 2 |
| 8 hg merge 1 | 8 hg merge 1 |
| 9 e7fe8eb3e180+0d24b7662d3e+ tip | 9 e7fe8eb3e180+0d24b7662d3e+ tip |
| 10 <<<<<<< my | |
| 10 something else | 11 something else |
| 11 ======= | 12 ======= |
| 12 something | 13 something |
| 14 >>>>>>> other | |
| 13 M a | 15 M a |