[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: Karl Fogel <kfogel_at_red-bean.com>
Date: 2007-11-28 06:51:13 CET

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.

-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 06:55:25 2007

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