problem merging deleted file

[Hollis Blanchard]

Hi, I'm working with this repository: 
http://xenbits.xensource.com/ext/xenppc-unstable.hg

I pull from http://xenbits.xensource.com/xen-unstable.hg (which is my 
upstream) and then hg update -m. I get this message:
	 local changed xen/arch/ia64/xenasm.S which remote deleted
	(k)eep or (d)elete?

This is odd because I haven't modified xen/arch/ia64/xenasm.S, and hg log and 
hg status confirm that.

Any help? Thanks!

-- 
Hollis Blanchard
IBM Linux Technology Center