2 Commits (3d234d0afacd355eb30b330a56bd2efa73bd44d5)

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