[PATCH] merge: perform case-collision checking on final set of actions

Pierre-Yves David pierre-yves.david at ens-lyon.org
Sat Dec 13 14:06:33 CST 2014



On 12/12/2014 05:39 PM, Martin von Zweigbergk wrote:
> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz at google.com>
> # Date 1415973184 28800
> #      Fri Nov 14 05:53:04 2014 -0800
> # Node ID b4c4f7028eb1cac2f89cecab2036e5d95334622f
> # Parent  495bc1b65d25872324a0220354f048b220304bd1
> merge: perform case-collision checking on final set of actions

Pushed to the clowncopter, thanks.

-- 
Pierre-Yves David


More information about the Mercurial-devel mailing list