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