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

r6671:938eddd7 default
r7665:950484f0 default
Show More
test-1102.out
4 lines | 178 B | text/plain | TextLexer
adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
tip 3:a49829c4fc11
t1 0:f7b1eb17ad24