2 Commits (539d84fe0a661f4e273d8a22e74d55d2fafc7598)

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