[PATCH 11 of 11 V2] filemerge: use 'basic' as the default of '[ui] mergemarkers' for safety

[Matt Mackall]

On Sun, 2014-07-06 at 03:00 +0900, FUJIWARA Katsunori wrote:
> # HG changeset patch
> # User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
> # Date 1404583001 -32400
> #      Sun Jul 06 02:56:41 2014 +0900
> # Node ID f5d064452b9b7fa6c001c5f92baf7ae1c34fd8a0
> # Parent  21eb3ac84075d72de5adc097f8fe4bfe1f66c1b8
> filemerge: use 'basic' as the default of '[ui] mergemarkers' for safety

Ok, it looks like we've got no choice but to switch back. This is queued
for default, thanks. And special thanks to everyone involved for testing
the default branch and finding this issue before the release.

-- 
Mathematics is the supreme nostalgia of our time.