upstream/mercurial-mirror Files · mercurial/templates

merge: introduce hasconflicts() on mergeresult object...

merge: introduce hasconflicts() on mergeresult object This and upcoming patches will improve the mergeresult object making it more powerful and provide clean APIs for various things. Doing this will clean up the core merge code which is present in `update()` a bit. Differential Revision: https://phab.mercurial-scm.org/D8816

Pulkit Goyal -


            r45835:0c849f01

default

Name	Size	Modified	Last Commit	Author
/ mercurial / templates
atom
coal
gitweb
json
monoblue
paper
raw
rss
spartan
static
map-cmdline.bisect	Loading ...
map-cmdline.changelog	Loading ...
map-cmdline.compact	Loading ...
map-cmdline.default	Loading ...
map-cmdline.phases	Loading ...
map-cmdline.show	Loading ...
map-cmdline.status	Loading ...
map-cmdline.xml	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