[PATCH 2 of 5] filemerge: indicate that local/other are p1/p2

Pierre-Yves David pierre-yves.david at ens-lyon.org
Sat Mar 19 13:34:25 EDT 2016



On 03/17/2016 08:46 AM, timeless wrote:
> # HG changeset patch
> # User timeless <timeless at mozdev.org>
> # Date 1458174961 0
> #      Thu Mar 17 00:36:01 2016 +0000
> # Node ID 18892389001b3c991524cf04bbb004a7a1a15188
> # Parent  a96a4945808a3d3896e81d2204ef1ccd3a44a251
> filemerge: indicate that local/other are p1/p2

I've pushed this one to the clowncopter.

patch 3 had comment from simon, I had feedback on patch 5 and patch 4 
make sense for patch 5 only. Dropping the rest of the series off the 
patchwork.

Cheers,

-- 
Pierre-Yves David


More information about the Mercurial-devel mailing list