commit 8034b4067e0b73849730c8e8ae100882b1e27d18 Author: cypherpunks cypherpunks@torproject.org Date: Fri Nov 4 14:35:29 2016 +0000

Ignore git mergetool backup files --- .gitignore | 2 +- test/unit/installation.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore index 7f97772..06c4035 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ +*.orig *.pyc *.swp *.swo .tox test/data/ docs/_build/ - diff --git a/test/unit/installation.py b/test/unit/installation.py index 6bd8f63..12a1e2e 100644 --- a/test/unit/installation.py +++ b/test/unit/installation.py @@ -76,7 +76,7 @@ class TestInstallation(unittest.TestCase): for filename in entry[2]: path = os.path.join(directory, filename)

- if path.endswith('.py') or path.endswith('.pyc'): + if path.endswith('.orig') or path.endswith('.py') or path.endswith('.pyc'): continue elif path not in data_files: self.fail("setup.py doesn't install %s" % path)