2 Commits (47dd0d595d04ee5283dfd8a0b4cbd6e6de8ad57f)

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. 20 years ago