diff hgweb.cgi @ 29660:99b50346b750

merge: concatenate default conflict marker at parsing phase of .py "+" operations are unnecessary.
author Yuya Nishihara <yuya@tcha.org>
date Tue, 05 May 2015 10:51:34 +0900
parents 4b0fc75f9403
children 47ef023d0165
line wrap: on
line diff