aboutsummaryrefslogtreecommitdiffstats
path: root/docs/merge.txt
Commit message (Expand)AuthorAgeFilesLines
* Linked FAQJason R. Coombs2013-06-091-0/+5
* Moved MERGE.txt into the setuptools documentation.Jason R. Coombs2013-06-091-0/+117