Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge7.t
changeset 17132 b87acfda5268
parent 16913 f2719b387380
child 18541 5ed6a375e9ca 
--- a/tests/test-merge7.t	Wed Jul 04 17:29:49 2012 +0200
+++ b/tests/test-merge7.t	Wed Jul 11 15:03:10 2012 -0700
@@ -105,12 +105,12 @@
   three
 
   $ 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
-       2        16      15      2       2 8fe46a3eb557 01365c4cca56 000000000000
-       3        31      27      2       3 fc3148072371 7b013192566a 8fe46a3eb557
-       4        58      25      4       4 d40249267ae3 8fe46a3eb557 000000000000
+     rev    offset  length  ..... linkrev nodeid       p1           p2 (re)
+       0         0       7  .....       0 01365c4cca56 000000000000 000000000000 (re)
+       1         7       9  .....       1 7b013192566a 01365c4cca56 000000000000 (re)
+       2        16      15  .....       2 8fe46a3eb557 01365c4cca56 000000000000 (re)
+       3        31      2.  .....       3 fc3148072371 7b013192566a 8fe46a3eb557 (re)
+       4        5.      25  .....       4 d40249267ae3 8fe46a3eb557 000000000000 (re)
 
   $ hg log
   changeset:   4:40d11a4173a8
mercurial