comparison gitignore @ 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 4ee5a11d8355
children 63f450f5c3fb
comparison
equal deleted inserted replaced
30:7dfc911400a3 31:faf7781dae42