[PATCH] contrib: make editmerge look for merge markers at the beginning of the line

[Matt Mackall]

On Fri, 2015-10-16 at 15:06 -0700, Christian Delahousse wrote:
> # HG changeset patch
> # User Christian Delahousse <cdelahousse at fb.com>
> # Date 1445032902 25200
> #      Fri Oct 16 15:01:42 2015 -0700
> # Node ID 2780052831c11e02e2af1e47d4b2e8113b609a8b
> # Parent  0c42b6bb23297d369f8c4dbd951df3d99895c9e7
> contrib: make editmerge look for merge markers at the beginning of the line

Queued for default, thanks.

-- 
Mathematics is the supreme nostalgia of our time.