##// END OF EJS Templates
merge: tell _checkunknownfiles about whether this was merge --force...
merge: tell _checkunknownfiles about whether this was merge --force In an upcoming patch we'll have different behavior here for when 'merge --force' is used as opposed to when other kinds of force operations are performed, like rebases.
Siddharth Agarwal -
r28020:cffa46cb default
Show More
Name Size Modified Last Commit Author
/ mercurial / templates / raw
changelog.tmpl Loading ...
changeset.tmpl Loading ...
error.tmpl Loading ...
fileannotate.tmpl Loading ...
filediff.tmpl Loading ...
graph.tmpl Loading ...
graphedge.tmpl Loading ...
graphnode.tmpl Loading ...
index.tmpl Loading ...
logentry.tmpl Loading ...
manifest.tmpl Loading ...
map Loading ...
notfound.tmpl Loading ...
search.tmpl Loading ...