diff setup.py @ 3851:9ebed1e95ef7

changelog: add a changelog entry about divergence resolution We made a lots of progress there.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 14 Jun 2018 02:58:30 +0200
parents efac9aad0963
children 9f2e480ad786
line wrap: on
line diff