2 Commits (5d028406e5c24eaccaa8e8bb13c0d9ac6b379bf1)

Author SHA1 Message Date
Junio C Hamano 9688a882e1 Documentation: recursive is the default strategy these days. 19 years ago
Jon Loeliger 93d69d8691 Refactored merge options into separate merge-options.txt. 19 years ago