##// 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.

File last commit:

r19905:078ccd78 default
r28020:cffa46cb default
Show More
changelog.tmpl
5 lines | 67 B | application/x-cheetah | CheetahLexer
{header}
# HG changelog
# Node ID {node}
{entries%changelogentry}