Mercurial > hg
comparison mercurial/merge.py @ 43090:1f339b503a40
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 |
comparison
equal
deleted
inserted
replaced
| 43089:c59eb1560c44 | 43090:1f339b503a40 |
|---|---|
| 21 modifiednodeid, | 21 modifiednodeid, |
| 22 nullhex, | 22 nullhex, |
| 23 nullid, | 23 nullid, |
| 24 nullrev, | 24 nullrev, |
| 25 ) | 25 ) |
| 26 from .pycompat import delattr | |
| 26 from .thirdparty import attr | 27 from .thirdparty import attr |
| 27 from . import ( | 28 from . import ( |
| 28 copies, | 29 copies, |
| 29 encoding, | 30 encoding, |
| 30 error, | 31 error, |