Add functional tests and examples for merge

merge.py is undocumented and untested, which is undesirable, as it does
not seem to be going away any time soon.

Change-Id: I7e4870e58a32c567e5947b9a48893b8210ad4d65
This commit is contained in:
Clint Byrum
2013-09-18 18:08:08 -07:00
parent b7f0bb6123
commit 0dbf2810a0
7 changed files with 86 additions and 1 deletions

2
.gitignore vendored
View File

@@ -39,3 +39,5 @@ nosetests.xml
*~
*.swp
doc/_build