author | Thomas Arendsen Hein <thomas@intevation.de> |
Tue, 22 Aug 2006 10:20:21 +0200 | |
changeset 2978 | 4e815ee377fd |
parent 2175 | b2ae81a7df29 |
child 4361 | 46280c004f22 |
permissions | -rw-r--r-- |
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 |
346 | 2 |
merge: warning: conflicts during merge |
3 |
merging a |
|
4 |
merging a failed! |
|
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
5 |
0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
6 |
There are unresolved merges, you can redo the full merge using: |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
7 |
hg update -C 2 |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
8 |
hg merge 1 |
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
|
9 |
e7fe8eb3e180+0d24b7662d3e+ tip |
346 | 10 |
something else |
11 |
======= |
|
12 |
something |
|
748 | 13 |
M a |