changeset 14182 | ec5886db9dc6 |
parent 12316 | 4134686b83e1 |
child 15501 | 2371f4aea665 |
--- a/tests/test-merge7.t Tue May 03 22:28:08 2011 +0200 +++ b/tests/test-merge7.t Wed May 04 13:37:41 2011 +0200 @@ -104,7 +104,7 @@ >>>>>>> other three - $ hg debugindex .hg/store/data/test.txt.i + $ hg debugindex test.txt rev offset length base linkrev nodeid p1 p2 0 0 7 0 0 01365c4cca56 000000000000 000000000000 1 7 9 1 1 7b013192566a 01365c4cca56 000000000000