diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-07-17 03:42:45 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-17 03:42:45 +0300 |
| commit | d3b88be1b450caa1244ed756c2fd7d7baadeafd8 (patch) | |
| tree | 85d3ade6a69a5e466bf9f09dc8cbb752824d442e /csum-file.h | |
| parent | fdbcdfcf61a64a1c2d2dd58c1a9111b45b6c1536 (diff) | |
| parent | 3585d0ea232b1a9c5498ab5785b11f61e93967c8 (diff) | |
Merge branch 'en/merge-dir-rename-corner-case-fix'
The merge code had funny interactions between content based rename
detection and directory rename detection.
* en/merge-dir-rename-corner-case-fix:
merge-recursive: handle rename-to-self case
merge-ort: ensure we consult df_conflict and path_conflicts
t6423: test directory renames causing rename-to-self
Diffstat (limited to 'csum-file.h')
0 files changed, 0 insertions, 0 deletions