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

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

resolve: restore .orig only after merge is fully complete (issue4952)...
resolve: restore .orig only after merge is fully complete (issue4952) Previously, we'd restore the .orig file after the premerge is complete but before the merge was complete. This would lead to the .orig file potentially containing merge conflict markers in it, as a leftover from the last merge attempt.
Aaron Jensen - - Load All Authors

File last commit:

r21057:19ee4923 default
r26959:ed5f20f9 stable
Show More
map
18 lines | 530 B | text/plain | TextLexer
/ mercurial / templates / rss / map
History | Annotation | Raw |Copy content |Copy permalink
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
bookmarks = bookmarks.tmpl
bookmarkentry = bookmarkentry.tmpl
branches = branches.tmpl
branchentry = branchentry.tmpl
error = error.tmpl
filedifflink = '{file|escape}<br />'
fileellipses = '{file|escape}<br />'
filenodelink = '{file|escape}<br />'
filenolink = '{file|escape}<br />'