Merge branch 'jc/rename-degrade-cc-to-c' into maint
commitb3c89315a33fbded4a8c5d533ca8ddc6087e4c23
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2011 19:00:02 +0000 (31 12:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2011 19:00:02 +0000 (31 12:00 -0700)
tree804bd0c440bcbd6c365460e5d60163b44cd8c200
parente596fd295fbb6e7453cd541554ba27ab185f870d
parentf31027c99cb2ec4eb7ad8d1ebc7f0e20fef4bd1d
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()
builtin/diff.c
builtin/log.c
diff.c
diff.h
diffcore-rename.c
merge-recursive.c
t/t4001-diff-rename.sh