Mercurial > evolve

diff MANIFEST.in @ 3806:99469bb3854e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add tests for resolving content-divergence when different parents This patch adds more tests for cases when we try to resolve content-divergence when they are on different parents. The last test shows the we are somehow missing the relocated commit in interrupted transaction. This will be fixed in next patch.
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 07 Jun 2018 15:54:32 +0530
parents b3dbba6e34c9
children 48b30ff742cb
line wrap: on
line diff