Configured Sublimerge, added rsub and TortoiseSVN