Subversion merging has mostly been fixed. I haven't really noticed much difference between the two systems.

One place where Subversion historically did better with respect to merging is avoiding merging by allowing you to lock files. We use this with some binary files in our repository. About a year ago Git added similar functionality but I haven't had the chance to try it yet.