diff bin/mkreport @ 31:faf7781dae42

Only show conflict markers when more than 3 <
author zegervdv <zegervdv@me.com>
date Tue, 01 Apr 2014 20:56:02 +0200
parents d35280c9b023
children 3bc2e4f5cc59
line wrap: on
line diff