Mercurial > hg

diff hgweb.cgi @ 40791:6f679f25fd4d stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: abort in-mem rebase if there's a dirty merge state In-memory merge uses the on-disk merge state, so we should not allow it run in-memory merge when the merge state is not clean. We should probably not use the on-disk merge state when running in-memory merge, but chaning that is not suitable for the stable branch. Differential Revision: https://phab.mercurial-scm.org/D5357
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 03 Dec 2018 09:36:40 -0800
parents 4b0fc75f9403
children 47ef023d0165
line wrap: on
line diff