The commands used were:
svn merge -r16681:16682 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r16710:16711 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r16681:16682 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/system_tests/__init__.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r16682 into '.':
C test_suite/system_tests/__init__.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r16710:16711 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r16711 into '.':
U generic_fns/align_tensor.py
[edau@... relax-trunk]$
