diff mercurial/merge.py @ 4616:9b00b73a5286

dirstate: hide some more internals
author Matt Mackall <mpm@selenic.com>
date Mon, 18 Jun 2007 13:24:34 -0500
parents 0912d8df5e19
children 66ed92ed115a
line wrap: on
line diff