fcm merge: consider unwrapping svn merge

[benfitzpatrick]

The wrapping of svn merge in fcm merge was introduced because of the lack of proper merge tracking in Subversion at the time. Subversion's merge handling has since become much better (mergeinfo, reintegrate handling), and we should consider whether we can reduce the fcm merge wrapping or remove it entirely.