Case Folding check on a file that wasn't changed

[Matt Mackall]

On Mon, 2012-09-24 at 20:03 +0000, Chuck.Kirschman at bentley.com wrote:
> My apologies.  Tested on 2.3.1.

Confirmed on Linux with FAT. What's happening is that the case collision
check is happening in the preliminaries before the bulk of the merge and
thus doesn't take into account that the file that would collide gets
deleted.

Work-around: merge with a revision before the new colliding file is
introduced, then merge again with the branch head.

-- 
Mathematics is the supreme nostalgia of our time.