meld --auto-merge argument

Pierre-Yves David pierre-yves.david at logilab.fr
Tue Apr 2 03:43:47 CDT 2013


On Mon, Apr 01, 2013 at 01:44:28PM -0500, Matt Mackall wrote:
> > Add --auto-merge, to enable automatic merging of all non-conflicting changes.
> 
> Questionable. How long has the current release been out? If people
> install this on their gnarly old RHEL system, are they going to need to
> hack their config to work with their gnarly old meld? My guess is yes

Mercurial instalation process does not install this configuration file.
Packager explicitly includes them in their package. I would trust[1] the
RHEL/Centos packagers to read the release note and handle the situation
themself. Debian is already shipping a compatible meld version.

-- 
Pierre-Yves David

http://www.logilab.fr/

[1] Blindly trust packager is a bit bold yes.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20130402/cabaec25/attachment.pgp>


More information about the Mercurial-devel mailing list