branch | stable |
changeset 49366 | 288de6f5d724 |
parent 49252 | 4141951dacff |
--- a/tests/test-merge7.t Thu Jun 16 15:15:03 2022 +0200 +++ b/tests/test-merge7.t Thu Jun 16 15:28:54 2022 +0200 @@ -105,7 +105,7 @@ three $ hg debugindex test.txt - rev linkrev nodeid p1 p2 + rev linkrev nodeid p1-nodeid p2-nodeid 0 0 01365c4cca56 000000000000 000000000000 1 1 7b013192566a 01365c4cca56 000000000000 2 2 8fe46a3eb557 01365c4cca56 000000000000