2 Commits (82f930deadc9a7990cbc0988255e6a5afd641f4b)

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