merge with crew-stable
authorKevin Bullock <kbullock@ringworld.org>
Fri, 16 Nov 2012 10:20:32 -0600
changeset 17950 a1f94e2f5da2
parent 17948 bc75638bea78 (current diff)
parent 17949 407209261f63 (diff)
child 17953 49c85541617b
merge with crew-stable
mercurial/commands.py
--- a/mercurial/commands.py	Fri Nov 16 10:01:26 2012 -0600
+++ b/mercurial/commands.py	Fri Nov 16 10:20:32 2012 -0600
@@ -2936,7 +2936,7 @@
     def matchlines(body):
         begin = 0
         linenum = 0
-        while True and begin < len(body):
+        while begin < len(body):
             match = regexp.search(body, begin)
             if not match:
                 break