aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorClint Byrum <clint@fewbar.com>2013-09-18 18:08:08 -0700
committerClint Byrum <clint@fewbar.com>2013-09-19 13:02:03 -0700
commit0dbf2810a0ee78658c35e61dc447c5f968226cb9 (patch)
tree3fbdcde17fd5ceb58b9baf548061306022aa269a /.gitignore
parentb7f0bb6123f75c87e4da51f6bfa7a92a515a898c (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--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index bc15ad2..769ab22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,5 @@ nosetests.xml
*~
*.swp
+
+doc/_build