Mercurial > hg
view tests/test-convert-bzr-114.out @ 11452:eac141407b85 stable
merge: document how to 'undo' a merge
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 27 Jun 2010 17:41:43 -0500 |
| parents | 13b36eb14324 |
| children |
line wrap: on
line source
% replace file with dir initializing destination source-hg repository scanning source... sorting... converting... 2 add d file 1 replace with d dir 0 add d/a % manifest of tip 644 d/a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved