From: Sabyasachi Ruj <ruj.sabya@gmail.com>
Date: Fri, 25 Jun 2010 05:36:46 GMT
Subject: Re: Confusion about content of conflicted file after : git remove/add
Message-ID: <AANLkTinQu19HKUC2a_JkSyeZ_SynE11eNwgH9zEMiY8g@mail.gmail.com>
In-Reply-To: <AANLkTilo0b9aL3oxk0b8eNkBWygwA7xSclTy1MaK8qba@mail.gmail.com>

>> So I think there may be a bug. I don't really see any code in
>> merge-recursive.c to handle conflicts on _both_ sides of a rename, but
>> obviously that is possible here.

Then I guess having contents of both the files would be an expected
behavior. Should I report a bug somewhere?
-
Sabyasachi