diff tests/test-merge6 @ 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 e506c14382fd
children ad3d5b4367cb
line wrap: on
line diff