Mercurial > hg
comparison tests/test-subrepo.t @ 15501:2371f4aea665
merge: give a special message for internal:merge failure (issue3105)
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 16 Nov 2011 18:04:19 -0600 |
| parents | 95174c381525 |
| children | e7119b091809 |
comparison
equal
deleted
inserted
replaced
| 15500:d5abe76da61e | 15501:2371f4aea665 |
|---|---|
| 243 updating: t 1/1 files (100.00%) | 243 updating: t 1/1 files (100.00%) |
| 244 picked tool 'internal:merge' for t (binary False symlink False) | 244 picked tool 'internal:merge' for t (binary False symlink False) |
| 245 merging t | 245 merging t |
| 246 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a | 246 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
| 247 warning: conflicts during merge. | 247 warning: conflicts during merge. |
| 248 merging t failed! | 248 merging t incomplete! (edit conflicts, then use 'hg resolve --mark') |
| 249 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 249 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 250 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 250 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 251 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 251 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 252 (branch merge, don't forget to commit) | 252 (branch merge, don't forget to commit) |
| 253 | 253 |