[PATCH 3 of 5] Filemerge: Environment Variable HGMERGE uses mergetool path from the

[Martin Geisler]

"S. Heimberg" <simohe at besonet.ch> writes:

> +        if toolpath and toolpath<>hgmerge:

Using <> is deprecated and has been removed in Python 3, so one should
use != instead. You will probably also want to put space around the
the operator as described in PEP8:

  http://www.python.org/dev/peps/pep-0008/

-- 
Martin Geisler

VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multi-Party Computation) to Python. See: http://viff.dk/.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 188 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20080806/7ca98f57/attachment.pgp