# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1703784094 10800
# Node ID 1ee7487666857a687d6895a31cdfc3179c9a86ca
# Parent  b162b76a1ee990733675aa3cd8ee35e7c12b6496
evolve: ignore attribute-error in compat code for simplemerge.Merge3Text

diff -r b162b76a1ee9 -r 1ee748766685 hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Tue Dec 26 16:22:18 2023 -0300
+++ b/hgext3rd/evolve/evolvecmd.py	Thu Dec 28 14:21:34 2023 -0300
@@ -821,8 +821,8 @@
     else:
         # hg <= 6.0 (12ac4401ff7d)
         kwargs['base_marker'] = b'|||||||'
-        desc = b''.join(merger.merge_lines(**kwargs))
-        conflicts = merger.conflicts
+        desc = b''.join(merger.merge_lines(**kwargs))  # pytype: disable=attribute-error
+        conflicts = merger.conflicts  # pytype: disable=attribute-error
 
     if conflicts: