diff doc/hgmerge.1.txt @ 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 345bac2bc4ec
children 63b9d2deed48
line wrap: on
line diff