[PATCH 2 of 2] doc: improves merge-tools example with an overwrite of existing config

[Pierre-Yves David]

On 05/14/2014 11:16 PM, pierre-yves.david at ens-lyon.org wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at fb.com>
> # Date 1343908294 -7200
> #      Thu Aug 02 13:51:34 2012 +0200
> # Node ID 537e136661e8aba78973f8278002e85951f13c6c
> # Parent  a3d54d20b2a5ad66a69946504ec1247ead4734b2
> doc: improves merge-tools example with an overwrite of existing config

I queued them after applying the siddharth fix. Siddharth gave me 
blessing for this.


-- 
Pierre-Yves David