2 Commits (39ba7d54649b35c943b026b54bff40cfa0153f3e)

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