From: Michael Witten <mfwitten@gmail.com>
Date: Tue, 23 Aug 2011 14:50:33 GMT
Subject: Re: Merge after directory rename ?
Message-ID: <CAMOZ1BtY=-F555pKtNWbNgRt_T-V5mtQE9dxTk-MQzhgNBuQXw@mail.gmail.com>
In-Reply-To: <CAC9GOO8w_zZ8wuRambnGoaS+rKskdjuSZVpF+b4mzdhzK48bjg@mail.gmail.com>

2011/8/22 Marcin Wiśnicki <mwisnicki@gmail.com>:
> 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!