##// END OF EJS Templates
merge: better debug messages before/after invoking external merge tool
merge: better debug messages before/after invoking external merge tool

File last commit:

r21057:19ee4923 default
r24727:5668202c 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 />'