2 Commits (fefe81c9964a12394d6ea81ce474ff402f0eb070)

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