##// END OF EJS Templates
resolve: fix incorrect merge...
resolve: fix incorrect merge The merge from stable into default was semantically incomplete -- a couple of changes in preceding code had to be rewritten here. This code only triggers for change/delete conflicts, so we can't test it yet. We will soon be able to do it, though.
Siddharth Agarwal -
r27025:ec372573 default
Show More
Name Size Modified Last Commit Author
/ mercurial / templates / monoblue
bookmarks.tmpl Loading ...
branches.tmpl Loading ...
changelog.tmpl Loading ...
changelogentry.tmpl Loading ...
changeset.tmpl Loading ...
error.tmpl Loading ...
fileannotate.tmpl Loading ...
filecomparison.tmpl Loading ...
filediff.tmpl Loading ...
filelog.tmpl Loading ...
filerevision.tmpl Loading ...
footer.tmpl Loading ...
graph.tmpl Loading ...
header.tmpl Loading ...
help.tmpl Loading ...
helptopics.tmpl Loading ...
index.tmpl Loading ...
manifest.tmpl Loading ...
map Loading ...
notfound.tmpl Loading ...
search.tmpl Loading ...
shortlog.tmpl Loading ...
summary.tmpl Loading ...
tags.tmpl Loading ...