On Tue, Feb 20, 2007 at 02:16:20PM -0800, dlr@tigris.org wrote:
> URL: http://svn.collab.net/viewvc/svn/branches/merge-tracking/subversion/bindings/swig/core.i?pathrev=23445&r1=23444&r2=23445
> ==============================================================================
> --- branches/merge-tracking/subversion/bindings/swig/core.i (original)
> +++ branches/merge-tracking/subversion/bindings/swig/core.i Tue Feb 20 14:16:20 2007
> @@ -432,7 +432,6 @@
> #endif
>
> /* -----------------------------------------------------------------------
> -<<<<<<< .working
> svn_mergeinfo_parse()
> */
>
There's a '======='/'>>>>>>>' marker as well - these things usually come
together :-)
Regards,
Malcolm
- application/pgp-signature attachment: stored
Received on Thu Feb 22 18:33:32 2007