diff tests/test-push-checkheads-unpushed-D4.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 2e703ed1c713
children d5adce52cef4 ef22eef37ecc
line wrap: on
line diff