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

r16438:28a90cdf default
r28020:cffa46cb default
Show More
__init__.py
0 lines | 0 B | text/x-python | PythonLexer