diff .hgignore @ 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 aad37ffd7d58
children ba316ce15040
line wrap: on
line diff