Merges recursing into subrepository branches

[Matt Mackall]

On Fri, 2012-01-20 at 14:43 -0800, paul_nathan at selinc.com wrote:
> Hi,
> 
> How does recursive subrepository merge (ie, merging the contents of 
> subrepos between branches) behavior get altered to select the *state* of 
> the subrepo, instead of attempting to merge the subrepo branches? Is there 
> a --config option or .hgrc option to select behavior?

No such option exists.

> --- discussion ---

This was too confusing.

-- 
Mathematics is the supreme nostalgia of our time.