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

tests: adjust merge tool config in test-largefiles-update.t...

tests: adjust merge tool config in test-largefiles-update.t Previously, the `ui.merge=internal:fail` configuration was shadowed by the the `HGMERGE=internal:merge` environment variable. We would like to remove this usage of `HGMERGE` variable because it is error-prone (eg: this very test). We start by cleaning up test independently to avoid large churn when the change happens.

Boris Feld -


            r40500:37e75be0

default

Name	Size	Modified	Last Commit	Author
/ mercurial / templates / raw
changelog.tmpl	Loading ...
changeset.tmpl	Loading ...
error.tmpl	Loading ...
fileannotate.tmpl	Loading ...
filediff.tmpl	Loading ...
graph.tmpl	Loading ...
graphedge.tmpl	Loading ...
graphnode.tmpl	Loading ...
index.tmpl	Loading ...
logentry.tmpl	Loading ...
manifest.tmpl	Loading ...
map	Loading ...
notfound.tmpl	Loading ...
search.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