diff hgmerge @ 861:cbe5c4d016b7

dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Interface is not yet changed. Non-regular files are considered to be removed or deleted. Removed the unneeded match(fn) call for adding to the unknown list.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 09 Aug 2005 11:32:30 +0100
parents 9c918287d10b
children 696851b1bba9
line wrap: on
line diff