equal
deleted
inserted
replaced
468 abort: uncommitted changes |
468 abort: uncommitted changes |
469 (do you want --merge?) |
469 (do you want --merge?) |
470 [255] |
470 [255] |
471 $ hg prev --merge --config commands.update.check=abort |
471 $ hg prev --merge --config commands.update.check=abort |
472 file 'bar' was deleted in other [destination] but was modified in local [working copy]. |
472 file 'bar' was deleted in other [destination] but was modified in local [working copy]. |
473 You can use (c)hanged version, (d)elete, or leave (u)nresolved. |
473 What do you want to do? |
474 What do you want to do? |
474 use (c)hanged version, (d)elete, or leave (u)nresolved? |
475 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
475 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
476 use 'hg resolve' to retry unresolved file merges |
476 use 'hg resolve' to retry unresolved file merges |
477 [1] added foo |
477 [1] added foo |
478 |
478 |
479 $ hg revert --all |
479 $ hg revert --all |