Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-convert-git.out @ 5347:9c0f864fddca
Merge with crew-stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 30 Sep 2007 12:36:11 +0200 |
| parents | 24de027551c1 9f35d0bcf00e |
| children | a5a7f7fd5554 |
line wrap: on
line diff
--- 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:69b3a302b4a1 +changeset: 5:c6d72c98aa00 tag: tip -parent: 1:0de2a40e261b -parent: 2:8815d3b33506 +parent: 3:a18bdfccf429 +parent: 4:48cb5b72ce56 user: test <test@example.org> -date: Mon Jan 01 00:00:13 2007 +0000 +date: Mon Jan 01 00:00:15 2007 +0000 files: a description: Merge branch other