[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r23445 - branches/merge-tracking/subversion/bindings/swig

From: Daniel Rall <dlr_at_collab.net>
Date: 2007-02-22 18:55:51 CET

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.

  • application/pgp-signature attachment: stored
Received on Thu Feb 22 19:00:06 2007

This is an archived mail posted to the Subversion Dev mailing list.