##// END OF EJS Templates
Update win32 merge tools configuration...
Update win32 merge tools configuration Add WinMerge and Beyond Compare 3 to default merge tools configuration. Fix TortoiseMerge configuration.

File last commit:

r7563:bbcd2dea default
r7665:950484f0 default
Show More
test-pull-http.out
12 lines | 339 B | text/plain | TextLexer
adding a
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% expect error, cloning not allowed
abort: authorization failed
requesting all changes
% serve errors
% expect error, pulling not allowed
abort: authorization failed
pulling from http://localhost/
searching for changes
% serve errors