Re: merge recursive and code movement

On Fri, Mar 25, 2011 at 12:00 PM, Jeff King [off-list ref] wrote:

OK, I figured it out. I was thrown off by test failures in t3030, but I
think that test is actually wrong; it documents what happens, but not
really what we _want_ to have happen.

So this is the patch series I ended up with:

 [1/3]: t3030: fix accidental success in symlink rename
 [2/3]: merge: handle renames with replacement content
 [3/3]: merge: turn on rewrite detection

I read through all three of these and, from my superficial
understanding of the merge code, they look correct.

I'll test these out on some actual merges as soon as I can. (Probably
next week.)

Thank you for this series.