[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-10-25 03:37:26 CEST

Augie Fackler <durin42@gmail.com> writes:
> In using Mercurial I noticed that hgmerge pretty much rocks across
> platforms for doing interactive merges, but the arguments it takes
> are somewhat different than ours. As such, I made a python wrapper
> for the hgmerge script, which is attached.

Do you think we should just change our interface to match? Or is
there something Mercurial-specific about hgmerge?

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 25 03:37:35 2007

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