Strange result of forced merge

[Matt Mackall]

On Mon, Mar 26, 2007 at 01:48:04PM -0600, Shane Holloway wrote:
> Hey Michal,
> 
> I don't have comments on the technical way merge -f is working, but I  
> do have a few experiences similar to the one you have described.  We  
> have had a few times where changes were mysteriously lost due to the  
> merge tool we were using, and a few times that a developer used merge  
> -f when he should not have committed and merged instead.

Sounds like there may be a real bug lurking here. If someone can come
up with a test case that demonstrates it, I'll try to fix it.

-- 
Mathematics is the supreme nostalgia of our time.