changeset 5336 | 24de027551c1 |
parent 5335 | 88e931f74e8b |
child 5347 | 9c0f864fddca |
--- a/tests/test-convert-git.out +++ b/tests/test-convert-git.out @@ -3,5 +3,20 @@ initializing destination git-repo-hg rep scanning source... sorting... converting... -1 t1 -0 t2 +3 t1 +2 t2.1 +1 t2.2 +0 Merge branch other +changeset: 3:69b3a302b4a1 +tag: tip +parent: 1:0de2a40e261b +parent: 2:8815d3b33506 +user: test <test@example.org> +date: Mon Jan 01 00:00:13 2007 +0000 +files: a +description: +Merge branch other + +committer: test <test@example.org> + +