Mercurial > public > mercurial-scm > hg

diff mercurial/simplemerge.py @ 16683:525fdb738975

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: eradicate long lines
author Brodie Rao <brodie@sf.io>
date Sat, 12 May 2012 15:54:54 +0200
parents 7de7630053cb
children e34106fa0dc3
line wrap: on
line diff
--- a/mercurial/simplemerge.py	Fri May 11 18:41:04 2012 +0200
+++ b/mercurial/simplemerge.py	Sat May 12 15:54:54 2012 +0200
@@ -222,7 +222,8 @@
         # section a[0:ia] has been disposed of, etc
         iz = ia = ib = 0
 
-        for zmatch, zend, amatch, aend, bmatch, bend in self.find_sync_regions():
+        for region in self.find_sync_regions():
+            zmatch, zend, amatch, aend, bmatch, bend = region
             #print 'match base [%d:%d]' % (zmatch, zend)
 
             matchlen = zend - zmatch