Junio C Hamano 8778fa8b4f 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
2021-08-30 16:06:01 -07:00
..
2021-08-24 15:33:23 -07:00
2019-05-09 00:37:27 +09:00
2020-08-04 18:34:02 -07:00
2020-09-19 15:56:06 -07:00
2021-04-08 14:18:03 -07:00
2019-01-23 11:37:29 -08:00
2019-05-07 13:04:48 +09:00
2021-05-24 18:08:22 +09:00
2021-05-16 21:05:24 +09:00
2019-10-21 12:02:39 +09:00