[PATCH] filemerge: add $revbase and $revother substitutions in merge tool arguments

Greg Ward greg at gerg.ca
Wed Aug 1 19:03:26 CDT 2012


On 01 August 2012, Vitaliy Filippov said:
> # HG changeset patch
> # User Vitaliy Filippov <vitalif at yourcmc.ru>
> # Date 1342116873 -14400
> # Node ID b861c6e313334007cc55462e473c4c2c8ad549c9
> # Parent  3ac9592b7ab432e1470ec97d19c9b7c58c3fda86
> filemerge: add $revbase and $revother substitutions in merge tool arguments
> 
> Usage example:

In addition to Mads' comments, we are (were) in feature freeze until
Matt releases 2.3, probably today. You'll need to resend to address
Mads' comments, but don't be surprised or offended if your patch is
ignored for a little while. It's release time and everyone is
concentrating on bug fixes.

       Greg
-- 
Greg Ward                                http://www.gerg.ca/
God made machine language; all the rest is the work of man.


More information about the Mercurial-devel mailing list