##// END OF EJS Templates
merge: call hg.abortmerge() directly and return early...
merge: call hg.abortmerge() directly and return early It's seem really weird to go through a lot of unrelated code before we call `hg.merge(..., abort=True)` when we can just call `hg.abortmerge()` and return early. Differential Revision: https://phab.mercurial-scm.org/D7995

File last commit:

r21057:19ee4923 default
r44637:6744859f default
Show More
map
18 lines | 530 B | text/plain | TextLexer
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 />'