Brad King <brad.k...@kitware.com> writes:
> On 09/10/2013 12:30 PM, Junio C Hamano wrote:
>> Thanks. I am not sure if I should rewind and rebuild the series
>> with these patches, though. This is a new feature and does not have
>> to be merged to 'maint', so rebasing is perfectly fine, but it is
>> not strictly necessary, either.
> I just thought I'd help out with the conflict resolution.
Yeah, such an independent confirmation of the conflict resolution is
very much appreciated.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html