[PATCH 6 of 6 V5] update: specify custom conflict markers for update (BC)

[Pierre-Yves David]

On 05/16/2014 04:48 PM, Durham Goode wrote:
> # HG changeset patch
> # User Durham Goode <durham at fb.com>
> # Date 1399684151 25200
> #      Fri May 09 18:09:11 2014 -0700
> # Node ID 43683c8563c3534d72090edab26dde9108e463b5
> # Parent  27cb0613b2f00a4638768454f272aa838f0503f0
> update: specify custom conflict markers for update (BC)

Ok, lets push this!

I thinks this is a significant improvement over the previous state. And 
we'll have 2 month to bikeshed this. (and also a few days before Matt 
review the 156 patches now in clowncopter.

(queued)

-- 
Pierre-Yves David