2 Commits (7a2a0d214169a5d6f22fc62c4ae6a7ca5b27fb3e)

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