Merge scenario results in conflict on svn:mergeinfo property

http://subversion.tigris.org/issues/show_bug.cgi?id=2936




User dlr changed the following:

                What    ld value 
               |New value
============================================================
====================
         Attachment data|                          |Created
an attachment (id=
                        |                          |741)
Test script which now
                        |                          | happily
displays "cat: di
                        |                         
|r_conflicts.prej: No such 
                        |                          |file or
directory"

------------------------------------------------------------
--------------------




------- Additional comments from dlrtigris.org Thu Sep 27
13:41:56 -0700 2007 -------
Created an attachment (id=741)
Test script which now happily displays "cat:
dir_conflicts.prej: No such file or directory"


------------------------------------------------------------
---------
To unsubscribe, e-mail: issues-unsubscribesubversion.tigris.org
For additional commands, e-mail: issues-helpsubversion.tigris.org