Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "merge-ort: ignore the directory rename split conflict for now"
This reverts commit 5ced7c3, which was put in place as a temporary measure to avoid optimizations unstably erroring out on no destination having a majority of the necessary renames for directories that had no new files and thus no need for directory rename detection anyway. Now that optimizations are in place to prevent us from trying to compute directory rename count computations for directories that do not need it, we can undo this temporary measure. Signed-off-by: Elijah Newren <newren@gmail.com>
- Loading branch information