The command used was:
svn merge -r17258:r17257 .
....
r17258 | bugman | 2012-07-16 19:46:31 +0200 (Mon, 16 Jul 2012) | 3 lines
Changed paths:
M /branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor/rdc_dy.txt
M /branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor/rdc_er.txt
M /branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor/rdc_tb.txt
M /branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor/rdc_tm.txt
Converted the test suite CaM RDC data for the rotor frame order model to the interatomic design.
....