summaryrefslogtreecommitdiff
path: root/docs/merge.txt
Commit message (Collapse)AuthorAgeFilesLines
* Remove documentation on merge, now relevant only for posterity (reference in ↵Jason R. Coombs2015-09-051-122/+0
| | | | the source tree).
* Linked FAQJason R. Coombs2013-06-091-0/+5
|
* Moved MERGE.txt into the setuptools documentation.Jason R. Coombs2013-06-091-0/+117
--HG-- rename : MERGE.txt => docs/merge.txt