diff oh-my-zsh/themes/custom.zsh-theme @ 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 36a9b3a28861
children 1b3381f349f0
line wrap: on
line diff