aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
AgeCommit message (Collapse)AuthorFilesLines
2015-10-08Update README.rstDan Prince1-10/+0
This commit renames and updates the rather outdated README for this project. Change-Id: Ibd1531dc14a2c04d8d91a3339c1df47a41c94790
2013-09-19Add functional tests and examples for mergeClint Byrum1-1/+7
merge.py is undocumented and untested, which is undesirable, as it does not seem to be going away any time soon. Change-Id: I7e4870e58a32c567e5947b9a48893b8210ad4d65
2013-02-26Initial commitJoshua McKenty1-0/+4