##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

filemerge: make capability check for internal tools ignore merge-tools section...
filemerge: make capability check for internal tools ignore merge-tools section This is follow up of 4d7b11877dd0. Before this patch, capability check of internal merge tools falls back to _toolbool(), which examines configurations in "merge-tools" section. But "hg help config" explicitly says that "merge-tools" section configures external merge tools. Therefore, this patch makes capability check for internal tools in hascapability() always ignore configurations in merge-tools section. In this patch, command line configurations below are added at tests in tests/test-merge-tools.t, in order to confirm that explicit configuration is intentionally ignored at tool selection. --config merge-tools.:INTERNAL_TOOL.CAPABILITY=true
Aaron Jensen - - Load All Authors

File last commit:

r21057:19ee4923 default
r39302:82555d71 default
Show More
map
18 lines | 530 B | text/plain | TextLexer
/ mercurial / templates / rss / map
History | Source | Raw |Copy content |Copy permalink
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 default = 'changelog'
mimetype = 'text/xml; charset={encoding}'
header = header.tmpl
changelog = changelog.tmpl
changelogentry = changelogentry.tmpl
filelog = filelog.tmpl
filelogentry = filelogentry.tmpl
tags = tags.tmpl
tagentry = tagentry.tmpl
Yuya Nishihara
hgweb: add missing bookmarks templates to atom/rss styles...
 r13858 bookmarks = bookmarks.tmpl
bookmarkentry = bookmarkentry.tmpl
Angel Ezquerra
hgweb: add branches RSS and Atom feeds...
 r18045 branches = branches.tmpl
branchentry = branchentry.tmpl
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 error = error.tmpl
Aaron Jensen
hgweb: adding branch, tags, bookmarks, user, and file list to rss feed entries
 r21057 filedifflink = '{file|escape}<br />'
fileellipses = '{file|escape}<br />'
filenodelink = '{file|escape}<br />'
filenolink = '{file|escape}<br />'