diff -r e8ea403b1c46 -r 288de6f5d724 tests/test-filebranch.t
--- a/tests/test-filebranch.t	Thu Jun 16 15:15:03 2022 +0200
+++ b/tests/test-filebranch.t	Thu Jun 16 15:28:54 2022 +0200
@@ -2,7 +2,6 @@
 when we do a merge.
 
   $ cat <<EOF > merge
-  > from __future__ import print_function
   > import sys, os
   > print("merging for", os.path.basename(sys.argv[1]))
   > EOF
@@ -73,7 +72,7 @@
 main: we should have a merge here:
 
   $ hg debugindex --changelog
-     rev linkrev nodeid       p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 cdca01651b96 000000000000 000000000000
        1       1 f6718a9cb7f3 cdca01651b96 000000000000
        2       2 bdd988058d16 cdca01651b96 000000000000
@@ -97,7 +96,7 @@
 foo: we should have a merge here:
 
   $ hg debugindex foo
-     rev linkrev nodeid       p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 b8e02f643373 000000000000 000000000000
        1       1 2ffeddde1b65 b8e02f643373 000000000000
        2       2 33d1fb69067a b8e02f643373 000000000000
@@ -106,21 +105,21 @@
 bar: we should not have a merge here:
 
   $ hg debugindex bar
-     rev linkrev nodeid       p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 b8e02f643373 000000000000 000000000000
        1       2 33d1fb69067a b8e02f643373 000000000000
 
 baz: we should not have a merge here:
 
   $ hg debugindex baz
-     rev linkrev nodeid       p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 b8e02f643373 000000000000 000000000000
        1       1 2ffeddde1b65 b8e02f643373 000000000000
 
 quux: we should not have a merge here:
 
   $ hg debugindex quux
-     rev linkrev nodeid       p1           p2
+     rev linkrev       nodeid    p1-nodeid    p2-nodeid
        0       0 b8e02f643373 000000000000 000000000000
        1       3 6128c0f33108 b8e02f643373 000000000000