2 Commits (0c7993839b92f466278439a724023f8be50391c1)

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