Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 43090:1f339b503a40

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: manually import pycompat.delattr where it is needed And with this change, we no longer need the auto-inserted import statement in the source transformer, so it has been removed! Differential Revision: https://phab.mercurial-scm.org/D7010
author Gregory Szorc <gregory.szorc@gmail.com>
date Sun, 06 Oct 2019 16:58:55 -0400
parents 687b865b95ad
children 74802979dd9d
line wrap: on
line diff
--- a/mercurial/merge.py	Sun Oct 06 16:55:18 2019 -0400
+++ b/mercurial/merge.py	Sun Oct 06 16:58:55 2019 -0400
@@ -23,6 +23,7 @@
     nullid,
     nullrev,
 )
+from .pycompat import delattr
 from .thirdparty import attr
 from . import (
     copies,