| commit | 969230b64fe76972d55b55cee8136e43a7e84752 | |
| author | Taylor Blau <me@ttaylorr.com> | |
| Mon, 31 Oct 2022 01:04:43 +0000 (30 21:04 -0400) | ||
| committer | Taylor Blau <me@ttaylorr.com> | |
| Mon, 31 Oct 2022 01:04:43 +0000 (30 21:04 -0400) | ||
| tree | 880d47df834dc02f7707b021ae7b43132e3426fc | treesnapshot (tar.gz zip) |
| parent | a23e0b69e2d25a893e187d86719de0b12b324579 | commitdiff |
| parent | 2b86c10084a54ee2b2e2cfd69ac02f3719fb47e0 | commitdiff |
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
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
| merge-ort.c | diff1 | diff2 | blobhistory |