2 Commits (aa4f31d5a3923939bf2cb670ecaa4f68025f4bf3)

Author SHA1 Message Date
Junio C Hamano 9688a882e1 Documentation: recursive is the default strategy these days. 20 years ago
Jon Loeliger bb73d73c08 Refactor merge strategies into separate includable file. 20 years ago