summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
AgeCommit message (Expand)AuthorFilesLines
2005-11-06Refactor merge strategies into separate includable file.Libravatar Jon Loeliger1-0/+35