Mercurial > evolve

changeset 6619:1ee748766685

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: ignore attribute-error in compat code for simplemerge.Merge3Text
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 28 Dec 2023 14:21:34 -0300
parents b162b76a1ee9
children 35e70a2a66f2
files hgext3rd/evolve/evolvecmd.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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: