equal
deleted
inserted
replaced
37 created new head |
37 created new head |
38 $ hg merge 1 |
38 $ hg merge 1 |
39 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
39 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
40 (branch merge, don't forget to commit) |
40 (branch merge, don't forget to commit) |
41 $ hg transplant 1 |
41 $ hg transplant 1 |
42 abort: outstanding uncommitted merges |
42 abort: outstanding uncommitted merge |
43 [255] |
43 [255] |
44 $ hg up -qC tip |
44 $ hg up -qC tip |
45 $ echo b0 > b1 |
45 $ echo b0 > b1 |
46 $ hg transplant 1 |
46 $ hg transplant 1 |
47 abort: outstanding local changes |
47 abort: uncommitted changes |
48 [255] |
48 [255] |
49 $ hg up -qC tip |
49 $ hg up -qC tip |
50 $ echo b2 > b2 |
50 $ echo b2 > b2 |
51 $ hg ci -Amb2 -d '1 0' |
51 $ hg ci -Amb2 -d '1 0' |
52 adding b2 |
52 adding b2 |