log bin/git-conflict @ 60:2b1b5bc62c73

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