aboutsummaryrefslogtreecommitdiffstats
path: root/docs/merge-faq.txt
Commit message (Collapse)AuthorAgeFilesLines
* Remove documentation on merge, now relevant only for posterity (reference in ↵Jason R. Coombs2015-09-051-80/+0
| | | | the source tree).
* Fixed capitalization of "Bitbucket"Martin Geisler2014-06-291-1/+1
| | | | Bitbucket is normally spelled with exactly one capital "b".
* 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