Mercurial > hg
comparison tests/test-merge-revert.out @ 3408:4e0c08f019b8
merge with main
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Mon, 16 Oct 2006 09:23:26 +0200 |
| parents | d2b55e3c4e25 |
| children | 4c94b6d0fb1c |
comparison
equal
deleted
inserted
replaced
| 3407:03e7e8958a27 | 3408:4e0c08f019b8 |
|---|---|
| 9 eb43f19ff115 | 9 eb43f19ff115 |
| 10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 11 ? file1.orig | 11 ? file1.orig |
| 12 016807e6fdaf tip | 12 016807e6fdaf tip |
| 13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 14 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 15 ? file1.orig | 15 ? file1.orig |
| 16 016807e6fdaf tip | 16 016807e6fdaf tip |
| 17 ? file1.orig | 17 ? file1.orig |
| 18 016807e6fdaf tip | 18 016807e6fdaf tip |
| 19 ? file1.orig | 19 ? file1.orig |