upstream/mercurial-mirror Files · mercurial/cext

rebase: in --confirm option just abort if hit a conflict...

rebase: in --confirm option just abort if hit a conflict Before this patch, it was prompting the user in both cases 1) when there is no conflict 2) when there is at least one conflict. But for simplicity we can just abort if we hit a conflict and no need to prompt in that case. Differential Revision: https://phab.mercurial-scm.org/D3944

Sushil khanchi -


            r38701:b3d0c97a

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