Mercurial > hg-stable

diff contrib/hgk @ 44668:e7af56a0733e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: don't create merge when continuing rebase interrupted by old hg This fixes the bug described and demonstrated in the previous commit. It does so by practically undoing 8082a77cc3a2 (rebase: remove some redundant setting of dirstate parents, 2020-01-10). Differential Revision: https://phab.mercurial-scm.org/D8356
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 01 Apr 2020 14:34:21 -0700
parents ce8dd4fd2d5d
children
line wrap: on
line diff