upstream/mercurial-mirror Files · mercurial/templates/atom

run-tests: define the default merge tool through configuration...

run-tests: define the default merge tool through configuration Using the `HGMERGE` environment variable generates confusion as it overrides any value set through configuration. By setting the default value through the default HGRC, the usual overriding rules apply and it should reduce confusion.

Boris Feld -


            r40506:d6b6f1b4

default

Name	Size	Modified	Last Commit	Author
/ mercurial / templates / atom
bookmarkentry.tmpl	Loading ...
bookmarks.tmpl	Loading ...
branchentry.tmpl	Loading ...
branches.tmpl	Loading ...
changelog.tmpl	Loading ...
changelogentry.tmpl	Loading ...
error.tmpl	Loading ...
filelog.tmpl	Loading ...
header.tmpl	Loading ...
map	Loading ...
tagentry.tmpl	Loading ...
tags.tmpl	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