showing them as much as "hg diff --git" when there are changes, it's clear that a lot of people want to use "hg diff" in this sort of situation. Chatting with my other hg users, it seems that this particular error (removing a file without hg rm, then getting stuck with "uncommitted changes") has happened several times to other people, and they've ended up recloning their repos to fix it. -- g