| changeset 4385 | 93a4e72b4f83 |
| parent 4361 | 46280c004f22 |
| 4384:1386a9cffc88 | 4385:93a4e72b4f83 |
|---|---|
57 # pull and merge from test-a again |
57 # pull and merge from test-a again |
58 cd ../test-b |
58 cd ../test-b |
59 hg pull ../test-a |
59 hg pull ../test-a |
60 hg merge --debug |
60 hg merge --debug |
61 |
61 |
62 cat test.txt | sed "s% .*%%" |
62 cat test.txt |
63 |
63 |
64 hg debugindex .hg/store/data/test.txt.i |
64 hg debugindex .hg/store/data/test.txt.i |
65 |
65 |
66 hg log |
66 hg log |