annotate rcrc @ 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 d20278638011
children db3720a03952
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
8
d20278638011 Add teamocil layouts
zegervdv <zegervdv@me.com>
parents: 0
diff changeset
1 EXCLUDES="vim Brewfile README.md Rakefile Gemfile"