[PATCH] keyword: avoid additional conflicts during merge/resolve

[Patrick Mézard]

Christian Ebert a écrit :
> # HG changeset patch
> # User Christian Ebert <blacktrash at gmx.net>
> # Date 1219386378 -7200
> # Node ID 1b311c57e5ce027107bfde179f9504cabca65319
> # Parent  a58a611c320fc763bb2dac5b3e468bad4c270629
> keyword: avoid additional conflicts during merge/resolve

In crew: http://hg.intevation.org/mercurial/crew/rev/17bdcd59b9ad

Thanks!

--
Patrick Mézard