2 Commits (1f1ab5f05b8e8b45545d8a406d64887f772a69da)

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