summaryrefslogtreecommitdiff
path: root/doc/merging.rst
AgeCommit message (Expand)Author
2013-04-02Fix the default string used for merging.Joshua Harlow
2013-03-08Enable the merging.txt to be in .rst format for public viewingJoshua Harlow