Initialized merge tracking via "svnmerge" with revisions "1-20577" from 
svn+ssh://bugman@svn.gna.org/svn/relax/branches/peak_intensities
Reverted r20620 as the checked out trunk copy was not up to date.

The command used was:
svn merge -r20620:r20619 .

.....
  r20620 | bugman | 2013-08-16 20:15:58 +0200 (Fri, 16 Aug 2013) | 3 lines
  Changed paths:
     M /trunk
  
  Initialized merge tracking via "svnmerge" with revisions "1-20577" from 
  svn+ssh://bugman@svn.gna.org/svn/relax/branches/peak_intensities
.....
Initialized merge tracking via "svnmerge" with revisions "1-20577" from 
svn+ssh://bugman@svn.gna.org/svn/relax/branches/peak_intensities