2 Commits (6a9b87972f27edfe53da4ce016adf4c0cd42f5e6)

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