upstream/mercurial-mirror Files · mercurial/helptext/internals

merge: pass mergeresult obj instead of actions in _filternarrowactions()...

merge: pass mergeresult obj instead of actions in _filternarrowactions() We want to use rich mergeresult object and it's APIs instead of handling a dictionary. Differential Revision: https://phab.mercurial-scm.org/D8823

Pulkit Goyal -


            r45842:e7196f1d

default

Name	Size	Modified	Last Commit	Author
/ mercurial / helptext / internals
__init__.py	Loading ...
bid-merge.txt	Loading ...
bundle2.txt	Loading ...
bundles.txt	Loading ...
cbor.txt	Loading ...
censor.txt	Loading ...
changegroups.txt	Loading ...
config.txt	Loading ...
extensions.txt	Loading ...
linelog.txt	Loading ...
mergestate.txt	Loading ...
requirements.txt	Loading ...
revlogs.txt	Loading ...
wireprotocol.txt	Loading ...
wireprotocolrpc.txt	Loading ...
wireprotocolv2.txt	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