diff .hgignore @ 5728:6dbfd71cdcba

divergence-resolution: clarify some test case We explain some situation, and the expected output. This is expected to be affected by the next changesets.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 22 Jan 2021 04:24:05 +0100
parents aad37ffd7d58
children ba316ce15040
line wrap: on
line diff