Re: Merge after directory rename ?

2011/8/22 Marcin Wiśnicki [off-list ref]:

Well kind of. Your example was different because you have created dir1
independently on branch1 and master in which case automatic rename
wouldn't be expected. If you would've created dir1 before branching
and renamed dir1 to dir3 (renamed all files under dir1) then I would
expect a rename while merging.

I already covered this case in my initial paragraph. Good Luck!