equal
deleted
inserted
replaced
17 $ hg copy --after --force foo bar |
17 $ hg copy --after --force foo bar |
18 $ hg copy foo baz |
18 $ hg copy foo baz |
19 $ hg ci -m 'make bar and baz copies of foo' -d '2 0' |
19 $ hg ci -m 'make bar and baz copies of foo' -d '2 0' |
20 created new head |
20 created new head |
21 $ hg bookmark premerge1 |
21 $ hg bookmark premerge1 |
22 $ hg merge |
22 $ hg merge -r 1 |
23 merging baz and foo to baz |
23 merging baz and foo to baz |
24 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
24 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
25 (branch merge, don't forget to commit) |
25 (branch merge, don't forget to commit) |
26 $ hg ci -m 'merge local copy' -d '3 0' |
26 $ hg ci -m 'merge local copy' -d '3 0' |
27 $ hg up -C 1 |
27 $ hg up -C 1 |