equal
deleted
inserted
replaced
373 $ echo "file b change 2" > b |
373 $ echo "file b change 2" > b |
374 $ hg commit -m "head 2" |
374 $ hg commit -m "head 2" |
375 created new head |
375 created new head |
376 $ hg merge |
376 $ hg merge |
377 merging a |
377 merging a |
|
378 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
378 merging b |
379 merging b |
379 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
|
380 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
380 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
381 0 files updated, 0 files merged, 0 files removed, 2 files unresolved |
381 0 files updated, 0 files merged, 0 files removed, 2 files unresolved |
382 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
382 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
383 [1] |
383 [1] |
384 $ hg resolve -m b |
384 $ hg resolve -m b |