diff mercurial/commands.py @ 17950:a1f94e2f5da2

merge with crew-stable
author Kevin Bullock <kbullock@ringworld.org>
date Fri, 16 Nov 2012 10:20:32 -0600
parents c8ffde272653 407209261f63
children a08775ec89f2
line wrap: on
line diff
--- 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