diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-08-09 00:26:10 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-09 00:26:10 +0300 |
| commit | 0bdaec1d3db90d69041531311fb34fa09639589b (patch) | |
| tree | 6820529b8aecd2a0285cded426791b4f47335de9 /t/helper/test-dir-iterator.c | |
| parent | c0a6c6614dcb660a31ac8b716a89a8911b1ab6d6 (diff) | |
| parent | ff6d54771af2c92867f773a264200f22b4cb2ab9 (diff) | |
Merge branch 'en/disable-dir-rename-in-recursive-merge'
"merge-recursive" hit a BUG() when building a virtual merge base
detected a directory rename.
* en/disable-dir-rename-in-recursive-merge:
merge-recursive: avoid directory rename detection in recursive case
Diffstat (limited to 't/helper/test-dir-iterator.c')
0 files changed, 0 insertions, 0 deletions