Mercurial > evolve
diff tests/test-topic-change.t @ 3735:bdf7fb6af7b8
evolve: take out logic to complete phase-divergence in separate fn
This patch takes out the logic to complete the content-divergence resolution to
it's own separate function so that we can reuse it in case of interrupted
resolution.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Sun, 29 Apr 2018 18:13:29 +0530 |
parents | 031d70bcbb42 |
children | d5adce52cef4 1bc4b0807c37 |