upstream/mercurial-mirror Files · hgext/largefiles

config: move mergetools configuration from contrib to default configuration...

config: move mergetools configuration from contrib to default configuration The merge tool configuration is an essential part of a good initial user experience. 'make osx' installers and direct 'make' installation did not have merge tool configuration. Now they have. Note: The installer fixes for windows have been done blindly and might require additional changes.

Mads Kiilerich -


            r23143:cd0c51c0

default

Name	Size	Modified	Last Commit	Author
/ hgext / largefiles
CONTRIBUTORS	Loading ...
__init__.py	Loading ...
basestore.py	Loading ...
lfcommands.py	Loading ...
lfutil.py	Loading ...
localstore.py	Loading ...
overrides.py	Loading ...
proto.py	Loading ...
remotestore.py	Loading ...
reposetup.py	Loading ...
uisetup.py	Loading ...
wirestore.py	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