##// END OF EJS Templates
merge: don't pay for pathconflicts if there are none
merge: don't pay for pathconflicts if there are none

File last commit:

r15168:cfccd3be default
r50781:3aa8e569 default
Show More
CONTRIBUTORS
4 lines | 172 B | text/plain | TextLexer
various
hgext: add largefiles extension...
r15168 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