Mercurial > hg
comparison tests/test-subrepo.t @ 12314:f2daa6ab514a
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Without specifying the parent revision of the working copy, users will
update to tip, which is most likely the other head they were trying to
merge, not the revision they were at before the merge.
| author | Brodie Rao <brodie@bitheap.org> |
|---|---|
| date | Sun, 12 Sep 2010 18:05:53 -0500 |
| parents | 36a65283c3af |
| children | 4134686b83e1 |
comparison
equal
deleted
inserted
replaced
| 12313:2912881c2a98 | 12314:f2daa6ab514a |
|---|---|
| 215 merging t | 215 merging t |
| 216 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a | 216 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
| 217 warning: conflicts during merge. | 217 warning: conflicts during merge. |
| 218 merging t failed! | 218 merging t failed! |
| 219 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 219 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 220 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon | 220 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 221 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 221 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 222 (branch merge, don't forget to commit) | 222 (branch merge, don't forget to commit) |
| 223 | 223 |
| 224 should conflict | 224 should conflict |
| 225 | 225 |