The command used was:
svn merge -r8038:8039 test_suite/system_tests/scripts/noe.py sample_scripts/noe.py
.....
r8039 | bugman | 2008-11-27 14:12:59 +0100 (Thu, 27 Nov 2008) | 6 lines
Changed paths:
M /branches/spectral_errors/test_suite/system_tests/scripts/noe.py
Modified the NOE system test to call the noe.spectrum_type() user function.
The spectrum_ids have also been changed to avoid user confusion (when these changes are ported to
the sample script).
.....
