aboutsummaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
Commit message (Expand)AuthorAge
* Documentation: recursive is the default strategy these days.Junio C Hamano2005-12-08
* Refactored merge options into separate merge-options.txt.Jon Loeliger2005-11-06