Fix bad merge with crew
authorBrendan Cully <brendan@kublai.com>
Fri, 11 Aug 2006 16:30:24 -0700
changeset 2862 1f813d4fbcc8
parent 2861 0f08f2c042ec
child 2863 f3c68e0ca37d
Fix bad merge with crew
mercurial/commands.py
--- a/mercurial/commands.py	Fri Aug 11 15:50:16 2006 -0700
+++ b/mercurial/commands.py	Fri Aug 11 16:30:24 2006 -0700
@@ -1825,7 +1825,6 @@
     wlock = repo.wlock()
     lock = repo.lock()
 
-    wlock = repo.wlock()
     for p in patches:
         pf = os.path.join(d, p)