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

Re: [PATCH] Implement (l)aunch an external merge tool

From: Eric Gillespie <epg_at_google.com>
Date: 2007-10-03 22:47:42 CEST

Augie Fackler <durin42@gmail.com> writes:

> I believe this addresses everything we talked about. The config
> variable doesn't work yet, but I didn't fix it per our discussion on
> IRC about you having added a fix for this in your wc.
>
> Attached the patch so that our mailserver can't munge it like it
> evidently did last time.

Looks good, except for some trailing whitespace, which I've
cleaned up; that will give you conflicts after I commit, though.
Running make check now, and suddenly wondering if some test needs
to be updated to know about the default config file change...

Thanks.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Oct 3 22:48:15 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.