diff tests/test-topic-push.t @ 3637:1b9c2720faee

tests: add test about handling phase-divergent merges We don't handle phase-divergent merges and we should. Upcoming patches will add the ability to handle them.
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 28 Mar 2018 17:13:08 +0530
parents f7129e3d5a38
children 85cdce113c2c 1bc4b0807c37
line wrap: on
line diff