Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 3560:09d99b7e4da0
simplify dirstate walking
- kill walkhelper
- stop passing dc around
- remove unused stat arg from statmatch (renamed imatch)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 26 Oct 2006 23:54:24 -0500 |
parents | 49988d9f0758 |
children | 41989e55fa37 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing b abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes