diff tests/test-push-checkheads-mixed-branch-topic-G3.t @ 5587:c2e71fc0efeb

unstable-list: add "merging files" section for content-divergence
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Tue, 22 Sep 2020 13:50:45 +0530
parents c6a84c6a26b8
children 35e769c9604f 12c53d7122a7
line wrap: on
line diff