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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html