2 Commits (695bf722da848e0cd2692bc07c4a2773c52b4216)

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