2 Commits (cdd5b82ee8e6941eee9c7b09df63c44789fd5c4b)

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