[PATCH 8 of 8] ui: add ui.mergemarkers=detailed to progressive mode

[Matt Mackall]

On Mon, 2015-03-30 at 14:03 -0700, Pierre-Yves David wrote:
> 
> On 03/28/2015 03:51 AM, Mathias De Maré wrote:
> > # HG changeset patch
> > # User Mathias De Maré <mathias.demare at gmail.com>
> > # Date 1427305134 -3600
> > #      Wed Mar 25 18:38:54 2015 +0100
> > # Node ID 5780f8bdbf8eba4fdce868847a104edae097dca5
> > # Parent  cf580680a070606cb8bfed0fd1afffbfecdcbf7c
> > ui: add ui.mergemarkers=detailed to progressive mode
> 
> Not certain about that, detailed merge marker had a tendency to explose 
> with non ascii metadata. Maybe we need a "safe" version if this is even 
> possible.

Yep, we've already reverted this once:

http://mercurial.markmail.org/thread/v2gw3qyxnh3n7564

-- 
Mathematics is the supreme nostalgia of our time.