Mercurial > hg
annotate tests/test-clone.out @ 3400:d2b55e3c4e25
merge: if filemerge skips merge, report as updated
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 15 Oct 2006 16:18:09 -0500 |
| parents | b2ae81a7df29 |
| children | aaeb7f5d1052 |
| rev | line source |
|---|---|
|
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 550 | 2 a |
| 3 checking changesets | |
| 4 checking manifests | |
| 5 crosschecking files in changesets and manifests | |
| 6 checking files | |
| 7 1 files, 1 changesets, 1 total revisions | |
|
1926
ba198d17eea9
changes by John Levon to standardize some erroroutput
Peter van Dijk <peter@dataloss.nl>
parents:
925
diff
changeset
|
8 a not present |
| 550 | 9 checking changesets |
| 10 checking manifests | |
| 11 crosschecking files in changesets and manifests | |
| 12 checking files | |
| 13 1 files, 1 changesets, 1 total revisions | |
|
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 550 | 15 a |