##// 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:

r6338:0750f111 default
r7665:950484f0 default
Show More
test-lock-badness.out
6 lines | 187 B | text/plain | TextLexer
/ tests / test-lock-badness.out
adding a
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
pushing to ../a
abort: could not lock repository ../a: Permission denied