Is it recommended to use tortoise svn or any other sub version system to upgrade the existing 1.3.8 (but modified) version to 1.3.9d?

Also, is winmerge enough/sufficient for this?
Are there any good 3 way merging tool people use or recommend?

Free or paid ones......please put your experiences
Thanks