From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Aug 2021 23:06:01 +0000 (-0700)
Subject: Merge branch 'en/ort-becomes-the-default'
X-Git-Tag: v2.34.0-rc0~235
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8778fa8b4f18a3930101825e5bcff62b5348e918;p=thirdparty%2Fgit.git

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
---

8778fa8b4f18a3930101825e5bcff62b5348e918