Found - a hg rm hadn't been done on a file that was to be deleted. Did that, 
committed, and merge then worked.
-- 
This message posted from opensolaris.org
_______________________________________________
opensolaris-help mailing list
[email protected]

Reply via email to