equal
deleted
inserted
replaced
17 abort: not a linear update |
17 abort: not a linear update |
18 (merge or update --check to force update) |
18 (merge or update --check to force update) |
19 [255] |
19 [255] |
20 $ rm b |
20 $ rm b |
21 $ hg update -c |
21 $ hg update -c |
22 abort: uncommitted local changes |
22 abort: uncommitted changes |
23 [255] |
23 [255] |
24 $ hg revert b |
24 $ hg revert b |
25 $ hg update -c |
25 $ hg update -c |
26 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
26 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
27 $ mv a c |
27 $ mv a c |