##// END OF EJS Templates
filemerge: print correct name of tool for symlink checks...
filemerge: print correct name of tool for symlink checks Earlier we'd print ':merge' even if the tool was something else like ':union'. That's clearly a bug.

File last commit:

r15168:cfccd3be default
r26518:a77679d0 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