##// END OF EJS Templates
merge: add removefile() to mergeresult object...
merge: add removefile() to mergeresult object There are cases where some further calculation makes the file not needing to be merged anymore and hence needs to be dropped in mergeresult object. This adds a function for that. Differential Revision: https://phab.mercurial-scm.org/D8821

File last commit:

r29438:82858f14 default
r45840:f1fb9a07 default
Show More
map
18 lines | 563 B | text/plain | TextLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 default = 'changelog'
feedupdated = '<updated>{date|rfc3339date}</updated>'
mimetype = 'application/atom+xml; charset={encoding}'
header = header.tmpl
changelog = changelog.tmpl
changelogentry = changelogentry.tmpl
filelog = filelog.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 atom feed entries
r21056 filedifflink = '{file|escape}<br />'
fileellipses = '{file|escape}<br />'
filenodelink = '{file|escape}<br />'
filenolink = '{file|escape}<br />'