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

r6344:ffeb926d default
r7665:950484f0 default
Show More
test-rebuildstate.out
9 lines | 110 B | text/plain | TextLexer
/ tests / test-rebuildstate.out
adding bar
adding foo
% state dump after
n 666 -1 bar
n 666 -1 foo
% status
! bar
? baz
C foo