comparison tests/test-merge5.t @ 29405:fbe380dc227a

pyflakes: use pycompat.pickles to prevent error The pyflakes in my test box complain about pickle in pycompat. mercurial/pycompat.py:17: 'pickle' imported but unused
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Fri, 24 Jun 2016 02:04:43 +0200
parents 6b1fc09c699a
children 527ce85c2e60
comparison
equal deleted inserted replaced
29404:591a8069b60e 29405:fbe380dc227a