The command used was:
svn merge -r21312:r21311 .
.....
r21312 | bugman | 2013-10-29 13:57:57 +0100 (Tue, 29 Oct 2013) | 3 lines
Changed paths:
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/generate_r2eff_files.log
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/generate_r2eff_files.py
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/500_1000.00.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/500_133.33.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/500_200.00.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/500_266.67.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/500_333.33.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/500_400.00.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/500_466.67.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/500_533.33.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/500_600.00.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/500_66.67.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/500_666.67.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/500_733.33.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/500_800.00.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/500_866.67.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/500_933.33.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/800_1000.00.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/800_133.33.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/800_200.00.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/800_266.67.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/800_333.33.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/800_400.00.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/800_466.67.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/800_533.33.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/800_600.00.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/800_66.67.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/800_666.67.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/800_733.33.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/800_800.00.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/800_866.67.r2eff
M /branches/relax_disp/test_suite/shared_data/dispersion/Hansen/r2eff_data/800_933.33.r2eff
Updated the R2eff data files of Flemming Hansen's CPMG data to include all spins.
.....