2 Commits (afbe700e43b06ef87be493583953d7cf71ab4405)

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