##// END OF EJS Templates
merge.applyupdates: switch to mergestate.clean()...
merge.applyupdates: switch to mergestate.clean() See the previous patches for why we're doing this.

File last commit:

r15168:cfccd3be default
r26990:11b1832d 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