equal
deleted
inserted
replaced
454 $ hg ev -q |
454 $ hg ev -q |
455 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
455 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
456 unresolved merge conflicts |
456 unresolved merge conflicts |
457 (see 'hg help evolve.interrupted') |
457 (see 'hg help evolve.interrupted') |
458 [1] |
458 [1] |
459 BROKEN: 'd' should be marked as a copy |
|
460 $ hg st -C |
459 $ hg st -C |
461 M a |
460 M a |
462 A d |
461 A d |
|
462 c |
463 R c |
463 R c |
464 ? a.orig |
464 ? a.orig |