From: Jeff King <peff@peff.net>
Date: Tue, 22 Feb 2011 15:39:09 GMT
Subject: Re: [PATCH 1/4] merge: improve inexact rename limit warning
Message-ID: <20110222153909.GB27178@sigill.intra.peff.net>
In-Reply-To: <7vzkppgdz9.fsf@alter.siamese.dyndns.org>

On Mon, Feb 21, 2011 at 03:33:14PM -0800, Junio C Hamano wrote:

> > Instead, let's have diffcore pass back the information about
> > how big the rename limit would needed to have been, and then
> > the caller can provide a more appropriate message (and at a
> > more appropriate time).
> [...]
> 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?

-Peff