Mercurial > hg
comparison tests/test-convert-hg-source.out @ 6512:368a4ec603cc
merge: introduce mergestate
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 10 Apr 2008 15:02:24 -0500 |
| parents | 4b0c9c674707 |
| children | 8e7130a10f3b |
comparison
equal
deleted
inserted
replaced
| 6511:5c1bb5750558 | 6512:368a4ec603cc |
|---|---|
| 1 created new head | 1 created new head |
| 2 merging baz and foo | 2 merging baz and foo to baz |
| 3 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | 3 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 4 (branch merge, don't forget to commit) | 4 (branch merge, don't forget to commit) |
| 5 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 5 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 6 merging foo and baz | 6 merging foo and baz to baz |
| 7 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | 7 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 8 (branch merge, don't forget to commit) | 8 (branch merge, don't forget to commit) |
| 9 created new head | 9 created new head |
| 10 initializing destination new repository | 10 initializing destination new repository |
| 11 scanning source... | 11 scanning source... |