diff hgmerge @ 4631:e3afa670e484

demandimport: fix issue579 and add a test fix suggested by Brendan
author Matt Mackall <mpm@selenic.com>
date Mon, 18 Jun 2007 19:43:26 -0500
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff