vsn merge: default to postpone

Hi there,

  I was doing a svn merge, which was taking some time, so I decided to
go away. When I got back it was stuck on :

Conflict discovered in 'CMakeLists.txt'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (h) help for more options: p

  I cannot find how I can specify to always postpone.

  Using

$ svn --version
svn, version 1.5.1 (r32289)
   compiled Jul 24 2008, 20:58:29

Thanks

-- 
Mathieu
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org