Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 2877:982c3237c63d
Make clear that hg pull -r REV pulls "up to" a revision.
The existing message was a bit confusing, making the reader
believe that only the specific revision is pulled.
author | Giorgos Keramidas <keramida@ceid.upatras.gr> |
---|---|
date | Sun, 13 Aug 2006 18:35:24 +0300 |
parents | b2ae81a7df29 |
children | 46280c004f22 |
line wrap: on
line source
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