comparison mercurial/merge.py @ 48993:225659936fff

util: restore the util.pickle symbol This was accidently dropped in df56e6bd37f6, which started importing pickle directly. That commit explicitly says it will retain it for compatibility with external stuff though. The unused import in pycompat isn't flagged because that module is skipped. Just importing with a comment seemed cleaner than `import X as Y` and then assigning to a `pickle` variable, just to avoid the pyflakes warning. Differential Revision: https://phab.mercurial-scm.org/D12419
author Matt Harbison <matt_harbison@yahoo.com>
date Tue, 29 Mar 2022 22:22:36 -0400
parents 642e31cb55f0
children 2e726c934fcd
comparison
equal deleted inserted replaced
48992:bde2e4ef968a 48993:225659936fff