2 Commits (797656e58ddbd82ac461a5142ed726db3a4d0ac0)

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