equal
deleted
inserted
replaced
15 hg co 0 |
15 hg co 0 |
16 |
16 |
17 echo blah > b |
17 echo blah > b |
18 |
18 |
19 hg ci -m "branch b" -d "1000000 0" |
19 hg ci -m "branch b" -d "1000000 0" |
20 HGMERGE=true hg up -m 1 |
20 HGMERGE=true hg merge 1 |
21 |
21 |
22 hg ci -m "merge b/a -> blah" -d "1000000 0" |
22 hg ci -m "merge b/a -> blah" -d "1000000 0" |
23 |
23 |
24 hg co 1 |
24 hg co 1 |
25 HGMERGE=true hg up -m 2 |
25 HGMERGE=true hg merge 2 |
26 hg ci -m "merge a/b -> blah" -d "1000000 0" |
26 hg ci -m "merge a/b -> blah" -d "1000000 0" |
27 |
27 |
28 hg log |
28 hg log |
29 hg debugindex .hg/00changelog.i |
29 hg debugindex .hg/00changelog.i |
30 |
30 |