Mercurial > evolve
comparison hgext3rd/__init__.py @ 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 | 143c8e4dc22d |
| children |
comparison
equal
deleted
inserted
replaced
| 3734:aae54e80c95c | 3735:bdf7fb6af7b8 |
|---|