diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-10-30 21:04:43 -0400 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-10-30 21:04:43 -0400 |
| commit | 969230b64fe76972d55b55cee8136e43a7e84752 (patch) | |
| tree | 880d47df834dc02f7707b021ae7b43132e3426fc /diffcore-rotate.c | |
| parent | a23e0b69e2d25a893e187d86719de0b12b324579 (diff) | |
| parent | 2b86c10084a54ee2b2e2cfd69ac02f3719fb47e0 (diff) | |
Merge branch 'en/ort-dir-rename-and-symlink-fix'
Merging a branch with directory renames into a branch that changes
the directory to a symlink was mishandled by the ort merge
strategy, which has been corrected.
* en/ort-dir-rename-and-symlink-fix:
merge-ort: fix bug with dir rename vs change dir to symlink
Diffstat (limited to 'diffcore-rotate.c')
0 files changed, 0 insertions, 0 deletions