##// END OF EJS Templates
merge.applyupdates: don't return early if merge driver's conclude failed...
merge.applyupdates: don't return early if merge driver's conclude failed Somewhat silly oversight -- this prevented the progress bar from being reset.

File last commit:

r15168:cfccd3be default
r26975:6618dfd3 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