summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
AgeCommit message (Expand)AuthorFilesLines
2005-12-08Documentation: recursive is the default strategy these days.Libravatar Junio C Hamano1-5/+5
2005-11-06Refactor merge strategies into separate includable file.Libravatar Jon Loeliger1-0/+35