summaryrefslogtreecommitdiff
path: root/doc/merging.txt
AgeCommit message (Expand)Author
2013-03-06Add some nice docs on what this is.Joshua Harlow