Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

updated stuff from laptop

  • Loading branch information...
commit a2d599b6f4b06c11ce17866c82c15fe94f62a2c1 1 parent 09855bb
Marco Munizaga authored
Showing with 7 additions and 1 deletion.
  1. +4 −0 .gitconfig
  2. +3 −1 .vim/.netrwhist
View
4 .gitconfig
@@ -11,3 +11,7 @@
email = marco.munizaga@grooveshark.com
[diff]
tool = vimdiff
+[merge]
+ tool = vim
+[mergetool "vim"]
+ cmd = vim \"+Gdiff\" $MERGED
View
4 .vim/.netrwhist
@@ -1,6 +1,8 @@
let g:netrw_dirhistmax =10
-let g:netrw_dirhist_cnt =4
+let g:netrw_dirhist_cnt =6
let g:netrw_dirhist_1='/home/marco/code/beluga/pub/resources/js/geography'
let g:netrw_dirhist_2='/home/marco/scripts'
let g:netrw_dirhist_3='/home/marco/code/beluga'
let g:netrw_dirhist_4='/home/marco/code/beluga/pub/resources'
+let g:netrw_dirhist_5='/home/marco/code/shortcutThing/site/public'
+let g:netrw_dirhist_6='/home/marco/code/beluga/pub/resources/js'

0 comments on commit a2d599b

Please sign in to comment.
Something went wrong with that request. Please try again.