Mercurial > hg
annotate tests/test-conflict.out @ 7574:4afc3208a7b8
tests: use killdaemons.py in test-pull-http
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Sat, 03 Jan 2009 20:20:40 +0100 |
parents | 92ccccb55ba3 |
children | 9fe7e6acf525 |
rev | line source |
---|---|
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
2 created new head |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
4387
diff
changeset
|
3 merging a |
4365
46280c004f22
change tests to use simplemerge by default
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
2175
diff
changeset
|
4 warning: conflicts during merge. |
346 | 5 merging a failed! |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
6 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
6518 | 7 use 'hg resolve' to retry unresolved file merges |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
8 e7fe8eb3e180+0d24b7662d3e+ tip |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
4387
diff
changeset
|
9 <<<<<<< local |
346 | 10 something else |
11 ======= | |
12 something | |
4387
93a4e72b4f83
run-tests.py: pass -L/--label to simplemerge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4365
diff
changeset
|
13 >>>>>>> other |
748 | 14 M a |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
4387
diff
changeset
|
15 ? a.orig |