diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-08-30 16:06:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-30 16:06:01 -0700 |
| commit | 8778fa8b4f18a3930101825e5bcff62b5348e918 (patch) | |
| tree | 309f07c553653f8f1c2c84b5b506ed47ee48a494 /t/t7600-merge.sh | |
| parent | Merge branch 'en/merge-strategy-docs' (diff) | |
| parent | Update docs for change of default merge backend (diff) | |
| download | tgif-8778fa8b4f18a3930101825e5bcff62b5348e918.tar.xz | |
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
Diffstat (limited to 't/t7600-merge.sh')
0 files changed, 0 insertions, 0 deletions