summaryrefslogtreecommitdiff
path: root/docs/merge-faq.txt
Commit message (Expand)AuthorAgeFilesLines
* Added sections on upgradingJason R. Coombs2013-06-091-1/+25
* Add headingJason R. Coombs2013-06-091-0/+3
* Reformatted faq for RSTJason R. Coombs2013-06-091-12/+21
* Adding merge FAQ as part of the project docs.Jason R. Coombs2013-06-091-0/+44