Merge from trunk to branch / branch to trunk using SVN 1.5

Now that using branches is easy in Subversion1.5, IDEA needs to make merging from trunk to branch as easy as doing "Version Control -> Update" including graphical conflict resolution, and merging from branch to trunk as easy as doing "Version Control -> Commit".    One of the main reasons I use IDEA is because of its great Subversion support but it needs to catch up to Subversion 1.5.

-- Eric