Mercurial > evolve

diff .hgignore @ 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 aad37ffd7d58
children ba316ce15040
line wrap: on
line diff