2 Commits (6f81bf16a91c4db5a02b81cbade89e73ca4d49b4)

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