Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 3565:549cb7b640fb
Simplify ignore logic in dirstate.walk
- kill blockignore hack
- pull pconvert out of imatch
- skip imatch when not ignoring
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 27 Oct 2006 12:09:33 -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