##// END OF EJS Templates
fsmonitor: fix silly "*kwargs" bug in merge.update() override...
fsmonitor: fix silly "*kwargs" bug in merge.update() override Everyone knows that it's supposed to be spelled with two asterisks. It started failing in fad5e299cfc7 (update: accept --merge to allow merging across topo branches (issue5125), 2017-02-13) because until then there was only one argument that was covered by the kwargs, so *kwargs or **kwargs both worked (or at least that's what I think with my limited understanding of Python).

File last commit:

r15168:cfccd3be default
r32405:bdc4861f default
Show More
CONTRIBUTORS
4 lines | 172 B | text/plain | TextLexer
Greg Ward, author of the original bfiles extension
Na'Tosha Bard of Unity Technologies
Fog Creek Software
Special thanks to the University of Toronto and the UCOSP program