2 Commits (8e7f9035b8271469747e3745aa7e095e12f74e5e)

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. 20 years ago