annotate vim/sessions/herakles.vim @ 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 5a413a3bd077
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
25
5a413a3bd077 Add vim-startify plugin
zegervdv <zegervdv@me.com>
parents:
diff changeset
1 cd ~/Documents/Projects/herakles
5a413a3bd077 Add vim-startify plugin
zegervdv <zegervdv@me.com>
parents:
diff changeset
2 args lib/* herakles.gemspec Rakefile spec/*
5a413a3bd077 Add vim-startify plugin
zegervdv <zegervdv@me.com>
parents:
diff changeset
3 edit lib/herakles.rb
5a413a3bd077 Add vim-startify plugin
zegervdv <zegervdv@me.com>
parents:
diff changeset
4 vertical sb spec/herakles_spec.rb