diff options
| author |  Elijah Newren <newren@gmail.com> | 2017-11-13 12:15:57 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-11-14 11:37:24 +0900 |
| commit | b520abf1c8f3dcbd218c9ae26830b7e2c94866c7 (patch) | |
| tree | 55ec05cc6a0fdb2e803433ee8445ea89b12dbd69 /t/t5801-remote-helpers.sh | |
| parent | Merge branch 'jm/status-ignored-files-list' (diff) | |
| download | tgif-b520abf1c8f3dcbd218c9ae26830b7e2c94866c7.tar.xz | |
sequencer: warn when internal merge may be suboptimal due to renameLimit
When many files were renamed, the recursive merge strategy stopped
detecting renames and left many paths with delete/modify conflicts,
without any warning about what was going on or providing any hints about
how to tell Git to spend more cycles to detect renames.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5801-remote-helpers.sh')
0 files changed, 0 insertions, 0 deletions