[merge]problems with committing merges in a dirstate tree with a symlink

[John Arbash Meinel]

John Arbash Meinel has voted +1 (conditional).
Status is now: Semi-approved
Comment:
I'm quite happy with this patch. The only thing it needs is a NEWS entry 
so that you can get proper credit. (And please reference any bug which 
this closes)

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C20070312210354.GA3819%40cyclops.localdomain%3E