comparison setup.py @ 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 efac9aad0963
children 9f2e480ad786
comparison
equal deleted inserted replaced
3636:92a2d3217de9 3637:1b9c2720faee