Mercurial > hg

comparison tests/test-status-color.t @ 15501:2371f4aea665

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 f0b047a24c57
children e7119b091809
comparison
equal deleted inserted replaced
15500:d5abe76da61e 15501:2371f4aea665
278 $ hg commit -m "head 2" 278 $ hg commit -m "head 2"
279 created new head 279 created new head
280 $ hg merge 280 $ hg merge
281 merging a 281 merging a
282 warning: conflicts during merge. 282 warning: conflicts during merge.
283 merging a failed! 283 merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
284 merging b 284 merging b
285 warning: conflicts during merge. 285 warning: conflicts during merge.
286 merging b failed! 286 merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
287 0 files updated, 0 files merged, 0 files removed, 2 files unresolved 287 0 files updated, 0 files merged, 0 files removed, 2 files unresolved
288 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon 288 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
289 [1] 289 [1]
290 $ hg resolve -m b 290 $ hg resolve -m b
291 291