diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-04-28 14:11:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-28 14:11:43 -0700 |
| commit | 76a89d6d828486f96f42c69ef0cf87bb6b72fef5 (patch) | |
| tree | e5112817beba1e701d20e88b4d0c5bdf5fe7de0d /t/t5515/fetch.br-config-explicit-merge | |
| parent | Merge branch 'mz/rebase' (diff) | |
| parent | diffcore-rename: fall back to -C when -C -C busts the rename limit (diff) | |
| download | tgif-76a89d6d828486f96f42c69ef0cf87bb6b72fef5.tar.xz | |
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()
Diffstat (limited to 't/t5515/fetch.br-config-explicit-merge')
0 files changed, 0 insertions, 0 deletions