diff tests/test-push-checkheads-mixed-branch-topic-G2.t @ 5585:1bc58c156c89

unstable-list: add a "details of resolution" section for content-divergence
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Tue, 22 Sep 2020 13:49:10 +0530
parents c6a84c6a26b8
children 35e769c9604f fc60328270ac
line wrap: on
line diff