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-- |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved merge: warning: conflicts during merge merging a merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved There are unresolved merges, you can redo the full merge using: hg update -C 2 hg merge 1 e7fe8eb3e180+0d24b7662d3e+ tip something else ======= something M a