diff hgmerge @ 4535:720ae5085ee3

commit: fix bug where dirstate for removed file is confused This fixes issue586
author Matt Mackall <mpm@selenic.com>
date Sun, 10 Jun 2007 21:16:58 -0500
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff