# HG changeset patch
# User Kevin Bullock <kbullock@ringworld.org>
# Date 1353082832 21600
# Node ID a1f94e2f5da2dee4e107eab035685285d9923999
# Parent  bc75638bea783b17e82f6c5826c242560401325a# Parent  407209261f6373b4b3f35e343d1498b63263d38e
merge with crew-stable

diff -r bc75638bea78 -r a1f94e2f5da2 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