changeset 2862:1f813d4fbcc8

Fix bad merge with crew
author Brendan Cully <brendan@kublai.com>
date Fri, 11 Aug 2006 16:30:24 -0700
parents 0f08f2c042ec
children f3c68e0ca37d
files mercurial/commands.py
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)