##// END OF EJS Templates
test-merge-prompt.t: unset HGMERGE...
test-merge-prompt.t: unset HGMERGE We're going to test behavior with and without HGMERGE, so disable it for the test.

File last commit:

r15168:cfccd3be default
r26895:fc41f9ff 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