Mercurial > evolve

diff .hgignore @ 5579:6289ddfb9d48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: refactor some error raising logic in content-divergence This patch makes sure that we raise error when it is ambiguous for us to decide the resolution parent. It modifies a test also to make sure that we don't loose code coverage for some cases.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Fri, 21 Aug 2020 18:04:48 +0530
parents aad37ffd7d58
children ba316ce15040
line wrap: on
line diff