##// END OF EJS Templates
merge.applyupdates: only attempt to merge files in mergeactions...
merge.applyupdates: only attempt to merge files in mergeactions This only makes a difference when a merge driver is active -- in that case we don't want to try and merge all the files, just the ones still unresolved after the merge driver's preprocess step is over.

File last commit:

r9999:f91e5630 default
r26949:b639b2f1 default
Show More
coal-file.png
0 lines | 273 B | image/png | TextLexer
/ mercurial / templates / static / coal-file.png
rendered-image