summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
AgeCommit message (Expand)Author
2005-12-08Documentation: recursive is the default strategy these days.Junio C Hamano
2005-11-06Refactor merge strategies into separate includable file.Jon Loeliger