diff tests/test-exchange-obsmarkers-case-B3.t @ 4583:4fcf9a71befc

evolve: show a status message when merging leads to public cset I think it would be fine to tell the user that merging the two divergent csets while resolving public divergence resulted into the public cset itself. If you think we don't need to tell the user, then we can include this in debug-mode for debugging purposes at least.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Wed, 17 Apr 2019 21:16:17 +0530
parents ab3581bc0637
children f555039d1a08
line wrap: on
line diff