equal
deleted
inserted
replaced
417 continue: hg evolve --continue |
417 continue: hg evolve --continue |
418 |
418 |
419 $ hg evolve --continue |
419 $ hg evolve --continue |
420 evolving 4:e568fd1029bb "added c e" |
420 evolving 4:e568fd1029bb "added c e" |
421 file 'd' was deleted in other but was modified in local. |
421 file 'd' was deleted in other but was modified in local. |
422 You can use (c)hanged version, (d)elete, or leave (u)nresolved. |
422 What do you want to do? |
423 What do you want to do? u |
423 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
424 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
424 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
425 unresolved merge conflicts |
425 unresolved merge conflicts |
426 (see 'hg help evolve.interrupted') |
426 (see 'hg help evolve.interrupted') |
427 [1] |
427 [1] |
428 |
428 |