The command used was:
svn merge -r3273:3274 svn+ssh://bugman@.../svn/relax/branches/multi_processor .
.....
r3274 | varioustoxins | 2007-04-27 23:58:18 +0200 (Fri, 27 Apr 2007) | 2 lines
Changed paths:
M /branches/multi_processor/minimise/generic.py
M /branches/multi_processor/multi/PrependStringIO.py
M /branches/multi_processor/multi/commands.py
M /branches/multi_processor/multi/mpi4py_processor.py
M /branches/multi_processor/multi/processor.py
M /branches/multi_processor/relax
correction to master slave output prefixes
.....