diff --git a/tests/test-convert-git.out b/tests/test-convert-git.out --- a/tests/test-convert-git.out +++ b/tests/test-convert-git.out @@ -1,18 +1,21 @@ +rm 'd/b' assuming destination git-repo-hg initializing destination git-repo-hg repository scanning source... sorting... converting... -3 t1 -2 t2.1 -1 t2.2 +5 t1 +4 t2 +3 t3 +2 t4.1 +1 t4.2 0 Merge branch other -changeset: 3:f0873470732d +changeset: 5:77dc8b329132 tag: tip -parent: 1:cb991dbbb06b -parent: 2:600bef931ca4 +parent: 3:6f360826ff29 +parent: 4:b5fadecd5d0e user: test -date: Mon Jan 01 00:00:13 2007 +0000 +date: Mon Jan 01 00:00:15 2007 +0000 files: a description: Merge branch other