You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Malcolm Rowe <ma...@farside.org.uk> on 2007/02/22 17:33:15 UTC
Re: svn commit: r23445 - branches/merge-tracking/subversion/bindings/swig
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
Re: svn commit: r23445 - branches/merge-tracking/subversion/bindings/swig
Posted by Daniel Rall <dl...@collab.net>.
On Thu, 22 Feb 2007, Malcolm Rowe wrote:
> 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 :-)
Thanks, fixed in r23465.