From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Apr 2011 21:11:43 +0000 (-0700)
Subject: Merge branch 'jc/rename-degrade-cc-to-c'
X-Git-Tag: v1.7.6-rc0~135
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=76a89d6d828486f96f42c69ef0cf87bb6b72fef5;p=git-core%2Fgit.git

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

* 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()
---

76a89d6d828486f96f42c69ef0cf87bb6b72fef5