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:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -39,3 +39,5 @@ nosetests.xml
|
||||
|
||||
*~
|
||||
*.swp
|
||||
|
||||
doc/_build
|
||||
|
||||
Reference in New Issue
Block a user