log bin/git-conflict @ 157:318c21a3243c

age author description
Tue, 01 Apr 2014 20:56:02 +0200 zegervdv Only show conflict markers when more than 3 <