diff tests/test-push-checkheads-partial-C4.t @ 3808:e6c0f45d51ed

evolve: factor out logic to merge content divergent csets in separate fn This will help us in reusing the logic if we need to while doing evolve --continue.
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 07 Jun 2018 18:13:54 +0530
parents 2e703ed1c713
children d5adce52cef4 ef22eef37ecc
line wrap: on
line diff