log bin/git-conflict @ 231:49fd5ea356f0

age author description
Tue, 01 Apr 2014 20:56:02 +0200 zegervdv Only show conflict markers when more than 3 <
Sun, 23 Feb 2014 18:52:12 +0100 zegervdv Add custom CLI tools