2 Commits (b6e56eca8a4eb74a86e9f2d99aa480c665458aa7)

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