diff options
| author |   Clint Byrum <clint@fewbar.com> | 2013-09-18 18:08:08 -0700 |
|---|---|---|
| committer | Clint Byrum <clint@fewbar.com> | 2013-09-19 13:02:03 -0700 |
| commit | 0dbf2810a0ee78658c35e61dc447c5f968226cb9 (patch) | |
| tree | 3fbdcde17fd5ceb58b9baf548061306022aa269a /.gitignore | |
| parent | b7f0bb6123f75c87e4da51f6bfa7a92a515a898c (diff) | |
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
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -39,3 +39,5 @@ nosetests.xml *~ *.swp + +doc/_build |