equal
deleted
inserted
replaced
|
1 $ hg init |
|
2 $ echo This is file a1 > a |
|
3 $ hg add a |
|
4 $ hg commit -m "commit #0" -d "1000000 0" |
|
5 $ echo This is file b1 > b |
|
6 $ hg add b |
|
7 $ hg commit -m "commit #1" -d "1000000 0" |
|
8 $ hg update 0 |
|
9 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
10 $ echo This is file c1 > c |
|
11 $ hg add c |
|
12 $ hg commit -m "commit #2" -d "1000000 0" |
|
13 created new head |
|
14 $ hg merge 1 |
|
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
16 (branch merge, don't forget to commit) |
|
17 $ rm b |
|
18 $ echo This is file c22 > c |
|
19 $ hg commit -m "commit #3" -d "1000000 0" |
|
20 |