Merge branch 'en/ort-becomes-the-default'

Use `ort` instead of `recursive` as the default merge strategy. * en/ort-becomes-the-default: Update docs for change of default merge backend Change default merge backend from recursive to ort

Junio C Hamano committed Aug 30, 2021 at 16:06 UTC 8778fa8b4f18a3930101825e5bcff62b5348e918

No changes.