summaryrefslogtreecommitdiff
path: root/doc/rtd/topics/merging.rst
AgeCommit message (Expand)Author
2013-03-08Enable the merging.txt to be in .rst format for public viewingJoshua Harlow