[PATCH 2 of 2 V4] filemerge: add internal:tagmerge merge tool

Matt Mackall mpm at selenic.com
Fri Jul 18 23:04:54 CDT 2014


On Sat, 2014-06-28 at 02:29 +0200, Angel Ezquerra wrote:
> # HG changeset patch
> # User Angel Ezquerra <angel.ezquerra at gmail.com>
> # Date 1403738425 -7200
> #      Thu Jun 26 01:20:25 2014 +0200
> # Node ID 587862fdf610c548c7acbe0bbef1d2f8d6114760
> # Parent  7438ab1de2dda75c76e6ef1daee8fdc58e3370fe
> filemerge: add internal:tagmerge merge tool

I've gone ahead and queued this (phew!) but I've marked it as
experimental for now. If this works well, we can consider using it to
replace internal:merge for the premerge step.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list