| changeset 3853 | c0b449154a90 |
| parent 2283 | e506c14382fd |
| child 4361 | 46280c004f22 |
| 3852:8a9a1a7e1698 | 3853:c0b449154a90 |
|---|---|
59 hg pull ../test-a |
59 hg pull ../test-a |
60 HGMERGE=merge hg merge --debug |
60 HGMERGE=merge hg merge --debug |
61 |
61 |
62 cat test.txt | sed "s% .*%%" |
62 cat test.txt | sed "s% .*%%" |
63 |
63 |
64 hg debugindex .hg/data/test.txt.i |
64 hg debugindex .hg/store/data/test.txt.i |
65 |
65 |
66 hg log |
66 hg log |