The command used was:
svn merge -r3331:3332 svn+ssh://bugman@.../svn/relax/1.2
.....
r3332 | bugman | 2007-07-09 22:48:18 +0200 (Mon, 09 Jul 2007) | 6 lines
Changed paths:
M /1.2/sample_scripts/jw_mapping.py
Application of Sebastien Morin's patch 'patch_sample_scripts_consistency_tests'.
See the post located at https://mail.gna.org/public/relax-devel/2007-07/msg00015.html for
details.
.....