Mercurial > evolve

diff setup.py @ 5782:72f65a647203

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
divergence-resolution: take parent successors in account If the parent were rewritten we need to take them in accound, but to help with resolution of a stack and to have a better 3 way merge. Changes in test file reflect the new behavior.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Fri, 22 Jan 2021 05:37:43 +0100
parents b3e178f3e31f
children 279c01842eca
line wrap: on
line diff