2 Commits (b4833a2c62578bdbfd300e296702214cb1b9a601)

Author SHA1 Message Date
Junio C Hamano 9688a882e1 Documentation: recursive is the default strategy these days. 20 years ago
Jon Loeliger bb73d73c08 Refactor merge strategies into separate includable file. 20 years ago