Age | Commit message (Collapse) | Author | |
---|---|---|---|
2013-04-02 | Fix the default string used for merging. | Joshua Harlow | |
It had been changed in code, but not in docs. So we needed to reflect the change in docs as well so that both are in sync. | |||
2013-03-08 | Enable the merging.txt to be in .rst format for public viewing | Joshua Harlow | |