From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 May 2011 19:00:02 +0000 (-0700)
Subject: Merge branch 'jc/rename-degrade-cc-to-c' into maint
X-Git-Tag: v1.7.5.4~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b3c89315a33fbded4a8c5d533ca8ddc6087e4c23;p=git.git

Merge branch 'jc/rename-degrade-cc-to-c' into maint

* jc/rename-degrade-cc-to-c:
  diffcore-rename: fall back to -C when -C -C busts the rename limit
  diffcore-rename: record filepair for rename src
  diffcore-rename: refactor "too many candidates" logic
  builtin/diff.c: remove duplicated call to diff_result_code()
---

b3c89315a33fbded4a8c5d533ca8ddc6087e4c23