changeset 6254 | 3667b6e4bbd0 |
parent 5405 | 8feb33c2d153 |
child 6737 | 7239e06e58e9 |
child 7222 | c1dc903dc7b6 |
--- a/tests/test-convert-git.out Fri Mar 14 09:56:58 2008 -0300 +++ b/tests/test-convert-git.out Fri Mar 14 09:56:58 2008 -0300 @@ -10,10 +10,10 @@ 2 t4.1 1 t4.2 0 Merge branch other -changeset: 5:c6d72c98aa00 +changeset: 5:4ab1af49a271 tag: tip -parent: 3:a18bdfccf429 -parent: 4:48cb5b72ce56 +parent: 3:0222ab0998d7 +parent: 4:5333c870e3c2 user: test <test@example.org> date: Mon Jan 01 00:00:15 2007 +0000 files: a