2 Commits (c9e6589288b09f4e631c7f12f0f9a77c29851632)

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. 20 years ago