| author | Matt Mackall <mpm@selenic.com> |
| Mon, 21 Aug 2006 14:25:56 -0500 | |
| changeset 2969 | 833677bc9791 |
| parent 2175 | b2ae81a7df29 |
| child 4365 | 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