# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1573072950 18000
# Node ID 3b581ad59459ed704af80b93d2101d11a5edcb91
# Parent  6ff196d2553b6c11811a90457968328416830fee
simplemerge: disable a pytype error where it's just confused

Differential Revision: https://phab.mercurial-scm.org/D7287

diff -r 6ff196d2553b -r 3b581ad59459 mercurial/simplemerge.py
--- a/mercurial/simplemerge.py	Wed Nov 06 15:42:12 2019 -0500
+++ b/mercurial/simplemerge.py	Wed Nov 06 15:42:30 2019 -0500
@@ -291,7 +291,19 @@
             if region[0] != b"conflict":
                 yield region
                 continue
-            issue, z1, z2, a1, a2, b1, b2 = region
+            # pytype thinks this tuple contains only 3 things, but
+            # that's clearly not true because this code successfully
+            # executes. It might be wise to rework merge_regions to be
+            # some kind of attrs type.
+            (
+                issue,
+                z1,
+                z2,
+                a1,
+                a2,
+                b1,
+                b2,
+            ) = region  # pytype: disable=bad-unpacking
             alen = a2 - a1
             blen = b2 - b1