[floss]:/home/kfogel/src/1.5.x>svn info | grep URL
URL: https://svn.collab.net/repos/svn/branches/1.5.x
[floss]:/home/kfogel/src/1.5.x>svn st -q
[floss]:/home/kfogel/src/1.5.x>svn merge -c29188 https://svn.collab.net/repos/svn/trunk/ .
--- Merging r29188 into '.':
U    subversion/libsvn_wc/adm_ops.c
Conflict discovered in 'subversion/svn/conflict-callbacks.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (h) help for more options: p
C    subversion/svn/conflict-callbacks.c
[floss]:/home/kfogel/src/1.5.x>svn st -q
 M     .
 M     www/images/subversion-diagram.png
 M     www/images/subversion_logo-200x173.png
 M     www/images/subversion_logo_hor-468x64.png
 M     www/images/subversion_logo-384x332.png
 M     notes/reintegrate-todo.txt
 M     notes/tree-conflicts/scratch-pad.txt
M      subversion/libsvn_wc/adm_ops.c
C      subversion/svn/conflict-callbacks.c
 M     CHANGES