upstream/mercurial-mirror Files · mercurial/cext

rebase: abort in-mem rebase if there's a dirty merge state...

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

Martin von Zweigbergk -


            r40836:6f679f25

stable

Name	Size	Modified	Last Commit	Author
/ mercurial / cext
__init__.py	Loading ...
base85.c	Loading ...
bdiff.c	Loading ...
charencode.c	Loading ...
charencode.h	Loading ...
dirs.c	Loading ...
manifest.c	Loading ...
mpatch.c	Loading ...
osutil.c	Loading ...
parsers.c	Loading ...
pathencode.c	Loading ...
revlog.c	Loading ...
util.h	Loading ...

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages