[PATCH] merge: concatenate default conflict marker at parsing phase of .py

[Pierre-Yves David]

On 08/02/2016 03:03 PM, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara <yuya at tcha.org>
> # Date 1430790694 -32400
> #      Tue May 05 10:51:34 2015 +0900
> # Node ID 93655d2b1ba1268615fd80ff3acfa04cea6f8f14
> # Parent  f6a3e181d30c8556d0188bd6d190229198fc8a01
> merge: concatenate default conflict marker at parsing phase of .py

Pushed, thanks

-- 
Pierre-Yves David