Mercurial > hg

comparison mercurial/simplemerge.py @ 34092:8a8e7a94ba07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: do not crash rebasing merge with a parent having hidden successor The added test will crash with previous code. Differential Revision: https://phab.mercurial-scm.org/D640
author Jun Wu <quark@fb.com>
date Wed, 06 Sep 2017 12:40:00 -0700
parents 6330df9d6393
children 93c4958d987c
comparison
equal deleted inserted replaced
34091:bbdca7e460c0 34092:8a8e7a94ba07