2 Commits (75dedd5a21246be03ae443e9fc6a9f75c6d2995b)

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