From d943a302b374b0bb28d48b148f1579e74a22ec23 Mon Sep 17 00:00:00 2001
From: Fabrice Douchant <Fabrice.Douchant@logilab.fr>
Date: Tue, 4 Nov 2008 18:36:51 +0100
Subject: pytest option --restart : shortcut -r is now -R (conflict with
 another option)

---
 pytest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pytest.py b/pytest.py
index 16f39a4..bda8564 100644
--- a/pytest.py
+++ b/pytest.py
@@ -583,7 +583,7 @@ def make_parser():
                       dest="exitfirst", default=False,
                       action="callback", help="Exit on first failure "
                       "(only make sense when pytest run one test file)")
-    parser.add_option('-r', '--restart', callback=rebuild_and_store,
+    parser.add_option('-R', '--restart', callback=rebuild_and_store,
                       dest="restart", default=False,
                       action="callback",
                       help="Restart tests from where it failed (implies exitfirst) "
-- 
cgit v1.2.1