equal
deleted
inserted
replaced
5 hg init |
5 hg init |
6 |
6 |
7 mkdir a |
7 mkdir a |
8 echo foo > a/a |
8 echo foo > a/a |
9 echo bar > a/b |
9 echo bar > a/b |
10 |
10 hg ci -Am "0" -d "0 0" |
11 hg add a |
|
12 hg ci -m "0" -d "0 0" |
|
13 |
11 |
14 hg co -C 0 |
12 hg co -C 0 |
15 hg mv a b |
13 hg mv a b |
16 hg ci -m "1 mv a/ b/" -d "0 0" |
14 hg ci -m "1 mv a/ b/" -d "0 0" |
17 |
15 |
18 hg co -C 0 |
16 hg co -C 0 |
19 echo baz > a/c |
17 echo baz > a/c |
|
18 echo quux > a/d |
20 hg add a/c |
19 hg add a/c |
21 hg ci -m "2 add a/c" -d "0 0" |
20 hg ci -m "2 add a/c" -d "0 0" |
22 |
21 |
23 hg merge --debug 1 |
22 hg merge --debug 1 |
24 echo a/* b/* |
23 echo a/* b/* |