diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-05-31 12:00:02 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-05-31 12:00:02 -0700 |
commit | b3c89315a33fbded4a8c5d533ca8ddc6087e4c23 (patch) | |
tree | 804bd0c440bcbd6c365460e5d60163b44cd8c200 /t/t1000-read-tree-m-3way.sh | |
parent | Merge branch 'rr/doc-content-type' into maint (diff) | |
parent | diffcore-rename: fall back to -C when -C -C busts the rename limit (diff) | |
download | tgif-b3c89315a33fbded4a8c5d533ca8ddc6087e4c23.tar.xz |
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()
Diffstat (limited to 't/t1000-read-tree-m-3way.sh')
0 files changed, 0 insertions, 0 deletions