diff setup.py @ 1796:2be05515b142 mercurial-3.8

merge with 5.6.0 A minor one line conflict on test output were encountered.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Wed, 01 Feb 2017 15:32:59 +0100
parents fb5e479080d8
children 9f42f819267b
line wrap: on
line diff