2 Commits (0ff5ec70c7d4fb5f176da5e05897c316fda82584)

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