diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-08-04 05:38:02 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-08-05 15:35:02 -0700 |
| commit | f5a3c5e6377b806c320e4220ba26e467b4c4e992 (patch) | |
| tree | 05ac0b4680ea0a353503b299c8b1bbf9a3585ae1 /t/t0020-crlf.sh | |
| parent | Change default merge backend from recursive to ort (diff) | |
| download | tgif-f5a3c5e6377b806c320e4220ba26e467b4c4e992.tar.xz | |
Update docs for change of default merge backend
Make it clear that `ort` is the default merge strategy now rather than
`recursive`, including moving `ort` to the front of the list of merge
strategies.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t0020-crlf.sh')
0 files changed, 0 insertions, 0 deletions