equal
deleted
inserted
replaced
414 $ hg --cwd b up -C 2 |
414 $ hg --cwd b up -C 2 |
415 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
415 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
416 $ hg --cwd b merge |
416 $ hg --cwd b merge |
417 merging b |
417 merging b |
418 warning: conflicts during merge. |
418 warning: conflicts during merge. |
419 merging b failed! |
419 merging b incomplete! (edit conflicts, then use 'hg resolve --mark') |
420 2 files updated, 0 files merged, 0 files removed, 1 files unresolved |
420 2 files updated, 0 files merged, 0 files removed, 1 files unresolved |
421 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
421 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
422 [1] |
422 [1] |
423 $ hg --cwd b revert -r 2 b |
423 $ hg --cwd b revert -r 2 b |
424 $ hg resolve -m b |
424 $ hg resolve -m b |