Mercurial > evolve

diff tests/test-push-checkheads-superceed-A6.t @ 3735:bdf7fb6af7b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2e703ed1c713
children d5adce52cef4 ef22eef37ecc
line wrap: on
line diff