##// END OF EJS Templates
simplemerge: disable a pytype error where it's just confused...
Augie Fackler -
r43787:3b581ad5 default
parent child Browse files
Show More
@@ -291,7 +291,19 b' class Merge3Text(object):'
291 if region[0] != b"conflict":
291 if region[0] != b"conflict":
292 yield region
292 yield region
293 continue
293 continue
294 issue, z1, z2, a1, a2, b1, b2 = region
294 # pytype thinks this tuple contains only 3 things, but
295 # that's clearly not true because this code successfully
296 # executes. It might be wise to rework merge_regions to be
297 # some kind of attrs type.
298 (
299 issue,
300 z1,
301 z2,
302 a1,
303 a2,
304 b1,
305 b2,
306 ) = region # pytype: disable=bad-unpacking
295 alen = a2 - a1
307 alen = a2 - a1
296 blen = b2 - b1
308 blen = b2 - b1
297
309
General Comments 0
You need to be logged in to leave comments. Login now