##// END OF EJS Templates
merge: extract method for checking for conflicting untracked file...
merge: extract method for checking for conflicting untracked file Now that the functionality is collected in one place, let's extract it to a method.

File last commit:

r15168:cfccd3be default
r23655:79235b46 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