summaryrefslogtreecommitdiff
path: root/doc/rtd/topics/merging.rst
Commit message (Expand)AuthorAgeFilesLines
* README: Mention move of revision control to git.HEADtrunkScott Moser2016-08-101-5/+0
* Update merging documentation to make its application clearerDaniel Watkins2016-05-201-3/+3
* Enable the merging.txt to be in .rst format for public viewingJoshua Harlow2013-03-081-0/+5