Mercurial > evolve

diff tests/test-topic.t @ 5730:a119432bafc1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
divergence-resolution: deal with simple "just one moved case" earlier While deciding the resolution parent for content-divergence resolution, now we use 3-way merge logic to check, if only one of them was moved from its original position by comparing the parent of both divergent cset with parent of base.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Fri, 22 Jan 2021 05:37:43 +0100
parents 61d2f1cf90f0
children 8e4f6354b316 87006dcf2bb7
line wrap: on
line diff