equal
deleted
inserted
replaced
9 hg commit -m "commit #1" -d "1000000 0" |
9 hg commit -m "commit #1" -d "1000000 0" |
10 hg update 0 |
10 hg update 0 |
11 echo This is file c1 > c |
11 echo This is file c1 > c |
12 hg add c |
12 hg add c |
13 hg commit -m "commit #2" -d "1000000 0" |
13 hg commit -m "commit #2" -d "1000000 0" |
14 hg update -m 1 |
14 hg merge 1 |
15 rm b |
15 rm b |
16 echo This is file c22 > c |
16 echo This is file c22 > c |
17 hg commit -m "commit #3" -d "1000000 0" |
17 hg commit -m "commit #3" -d "1000000 0" |