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

Re: Using hgmerge with 1.5's interactive conflict resolution

From: Augie Fackler <durin42_at_gmail.com>
Date: 2007-11-28 14:10:31 CET

On Nov 28, 2007, at 12:51 AM, Karl Fogel wrote:

> Augie Fackler <durin42@gmail.com> writes:
>>>> I submitted this a while ago, but all that came of it was
>>>> discussing
>>>> the interface to the external merge tool. Does it make sense to
>>>> include this script in contrib, or should I just publish it on my
>>>> own
>>>> hosting for now?
>>> Could you point to the original message in the archives, please?
>>> Thanks.
>> Sure thing - http://svn.haxx.se/dev/archive-2007-10/1211.shtml
> Thanks, added in r28106. I changed it to "-" instead of "_", as a
> slight majority of our contrib scripts seem to use the former, and it
> doesn't involve a shift on most keyboards. Hope that's okay; if not,
> we can change it.

Cool. It shouldn't be a problem to have "-" instead of "_", the only
reason I can think of that'd matter would be if someone wanted to
import the script as a module, which doesn't make sense to me.


> -Karl

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Nov 28 14:10:49 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.