Elijah Newren f5a3c5e637 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>

2021-08-05 15:35:02 -07:00

21 KiB

Raw Blame History

View Raw