diff zshrc @ 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 f9f04cee7f51
children 2da8d8daa033
line wrap: on
line diff