##// END OF EJS Templates
merge.mergestate: update docstrings for preresolve and resolve...
merge.mergestate: update docstrings for preresolve and resolve Add a docstring for preresolve, and update the one for resolve.

File last commit:

r15168:cfccd3be default
r26870:ab798d1a 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