From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Feb 2011 18:46:57 GMT
Subject: Re: [PATCH 1/4] merge: improve inexact rename limit warning
Message-ID: <7vsjvfdhzy.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20110222153909.GB27178@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

> On Mon, Feb 21, 2011 at 03:33:14PM -0800, Junio C Hamano wrote:
> ...
>> This conflicts with 2840824 (diffcore-rename: fall back to -C when -C -C
>> busts the rename limit, 2011-01-06) on 'pu', unfortunately.
>
> Do you want to do the merge, or do you want me to rebase on top of
> 2840824?

Please check the resolution queued on 'pu'; I suspect that your series
should graduate before the fall-back-to-c-from-c-c topic, so I'd rather
not to see you rebase this.