equal
deleted
inserted
replaced
1 + hg init |
|
2 + hg add a |
|
3 + hg commit -m commit #0 -d 0 0 |
|
4 + hg add b |
|
5 + hg commit -m commit #1 -d 0 0 |
|
6 + hg update 0 |
|
7 + hg add c |
|
8 + hg commit -m commit #2 -d 0 0 |
|
9 + hg update -m 1 |
|
10 + hg init |
|
11 + hg add a |
|
12 + hg commit -m commit #0 -d 0 0 |
|
13 + hg add b |
|
14 + hg commit -m commit #1 -d 0 0 |
|
15 + hg update 0 |
|
16 + hg add c |
|
17 + hg commit -m commit #2 -d 0 0 |
|
18 + hg update -m 1 |
|
19 merging for b |
1 merging for b |
20 merging b |
2 merging b |
21 + hg init |
|
22 + hg add a |
|
23 + hg commit -m commit #0 -d 0 0 |
|
24 + hg add b |
|
25 + hg commit -m commit #1 -d 0 0 |
|
26 + hg commit -m commit #2 -d 0 0 |
|
27 + hg update 1 |
|
28 + hg add c |
|
29 + hg commit -m commit #3 -d 0 0 |
|
30 This is file b1 |
3 This is file b1 |
31 + hg update -m 2 |
|
32 merging for b |
4 merging for b |
33 merging b |
5 merging b |
34 + hg init |
|
35 + hg add a |
|
36 + hg commit -m commit #0 -d 0 0 |
|
37 + hg add b |
|
38 + hg commit -m commit #1 -d 0 0 |
|
39 + hg commit -m commit #2 -d 0 0 |
|
40 + hg update 1 |
|
41 + hg add c |
|
42 + hg commit -m commit #3 -d 0 0 |
|
43 + hg update -m 2 |
|
44 merging for b |
6 merging for b |
45 merging b |
7 merging b |