Mercurial > evolve

diff .hgtags @ 4984:b779b40f996e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: fix content-divergence resolution when p1 is null (issue6201) Before this fix, in cases like in the added test, the revision number -1 of the parent was misinterpreted to mean the tipmost revision instead of the null revision, causing the content-divergence resolution to fail.
author Manuel Jacob <me@manueljacob.de>
date Fri, 06 Dec 2019 14:01:29 +0100
parents 597a90b8910c
children 4dc6b23c65bb
line wrap: on
line diff