Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-convert-git.out @ 5336:24de027551c1
Merge with crew-stable
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 24 Sep 2007 19:14:18 -0300 |
parents | 88e931f74e8b |
children | 9c0f864fddca |
comparison
equal
deleted
inserted
replaced
5328:8d00788ca578 | 5336:24de027551c1 |
---|---|
1 assuming destination git-repo-hg | 1 assuming destination git-repo-hg |
2 initializing destination git-repo-hg repository | 2 initializing destination git-repo-hg repository |
3 scanning source... | 3 scanning source... |
4 sorting... | 4 sorting... |
5 converting... | 5 converting... |
6 1 t1 | 6 3 t1 |
7 0 t2 | 7 2 t2.1 |
8 1 t2.2 | |
9 0 Merge branch other | |
10 changeset: 3:69b3a302b4a1 | |
11 tag: tip | |
12 parent: 1:0de2a40e261b | |
13 parent: 2:8815d3b33506 | |
14 user: test <test@example.org> | |
15 date: Mon Jan 01 00:00:13 2007 +0000 | |
16 files: a | |
17 description: | |
18 Merge branch other | |
19 | |
20 committer: test <test@example.org> | |
21 | |
22 |