From c2cc31874880d7f0d5bd444c6a3b17fa817e2509 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Fri, 29 Aug 2014 15:44:03 -0400 Subject: Deal with a merge conflict --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index a87f90e..5b3ec53 100644 --- a/tox.ini +++ b/tox.ini @@ -7,5 +7,5 @@ deps = logilab-common hg+https://bitbucket.org/logilab/astroid/ six -commands = python -Wi -m unittest discover -s {envsitepackagesdir}/pylint/test/ -p *test_*.py +commands = python -Wi -m unittest discover -s {envsitepackagesdir}/pylint/test/ -p {posargs:*test_*}.py changedir = {toxworkdir} -- cgit v1.2.1