2 Commits (cb0c6df6f5e850875af28b47c5c94482a326293f)

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