Merging with Subversion and IntelliJ IDEA 8.1.x
http://rjohnshields.com/blog/?p=118
IntelliJ IDEA Web Help Merging Branches
http://www.jetbrains.com/idea/webhelp/merging-branches.html
http://rjohnshields.com/blog/?p=118
IntelliJ IDEA Web Help Merging Branches
http://www.jetbrains.com/idea/webhelp/merging-branches.html