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

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

merge: don't ignore conflicting file in remote renamed directory...
merge: don't ignore conflicting file in remote renamed directory When the remote side has renamed a directory from a/ to b/ and added a file b/c in it, and the local side has added a file a/c, we end up moving a/c to b/c without considering the remote version of b/c. Add a check for this case and use the merge ('m') action in this case instead of the directory rename ('dm') action.
Aaron Jensen - - Load All Authors

File last commit:

r21056:d7070395 default
r23475:67f1d688 default
Show More
map
19 lines | 596 B | text/plain | TextLexer
/ mercurial / templates / atom / map
History | Source | Raw |Copy content |Copy permalink
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
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 atom feed entries
 r21056 filedifflink = '{file|escape}<br />'
fileellipses = '{file|escape}<br />'
filenodelink = '{file|escape}<br />'
filenolink = '{file|escape}<br />'