Make 'ort' the default merge strategy#404

Merged

derrickstolee merged 12 commits intomicrosoft:vfs-2.32.0from

derrickstolee:vfs-merge-ort

Aug 4, 2021

Commits on Aug 4, 2021

git-rebase.txt: correct antiquated claims about --rebase-merges

newren
authored and
derrickstolee
committed
directory-rename-detection.txt: small updates due to merge-ort optimizations

newren
authored and
derrickstolee
committed
Documentation: edit awkward references to `git merge-recursive`

newren
authored and
derrickstolee
committed
merge-strategies.txt: update wording for the resolve strategy

newren
authored and
derrickstolee
committed
merge-strategies.txt: do not imply using copy detection is desired

newren
authored and
derrickstolee
committed
merge-strategies.txt: avoid giving special preference to patience algorithm

newren
authored and
derrickstolee
committed
merge-strategies.txt: fix simple capitalization error

newren
authored and
derrickstolee
committed
git-rebase.txt: correct out-of-date and misleading text about renames

newren
authored and
derrickstolee
committed
merge-strategies.txt: add coverage of the `ort` merge strategy

newren
authored and
derrickstolee
committed
Update error message and code comment

newren
authored and
derrickstolee
committed
Change default merge backend from recursive to ort

newren
authored and
derrickstolee
committed
Update docs for change of default merge backend

newren
authored and
derrickstolee
committed