equal
deleted
inserted
replaced
458 |
458 |
459 Testing --merge works with other values of commands.update.check also |
459 Testing --merge works with other values of commands.update.check also |
460 |
460 |
461 XXX: things are broken! |
461 XXX: things are broken! |
462 $ hg prev --merge --config commands.update.check=abort |
462 $ hg prev --merge --config commands.update.check=abort |
463 local [working copy] changed bar which other [destination] deleted |
463 file 'bar' was deleted in other [destination] but was modified in local [working copy]. |
|
464 What do you want to do? |
464 use (c)hanged version, (d)elete, or leave (u)nresolved? |
465 use (c)hanged version, (d)elete, or leave (u)nresolved? |
465 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
466 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
466 use 'hg resolve' to retry unresolved file merges |
467 use 'hg resolve' to retry unresolved file merges |
467 [1] added foo |
468 [1] added foo |
468 |
469 |