# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1405965140 25200
# Node ID 896acf280e7a6d0d8a4707a59c1d84cdd07c1f0c
# Parent  2c45098ada4f7133b4c0bfa8c01673132c74c9a9
Make local Vim config consistent with Mercurial local config.

diff -r 2c45098ada4f -r 896acf280e7a .hgignore
--- a/.hgignore	Sun Jul 20 21:47:11 2014 -0700
+++ b/.hgignore	Mon Jul 21 10:52:20 2014 -0700
@@ -4,4 +4,5 @@
 cache/*
 .netrwhist
 hgrc/hgrc-local
+vim/vimrc-local
 
diff -r 2c45098ada4f -r 896acf280e7a .hgsubstate
--- a/.hgsubstate	Sun Jul 20 21:47:11 2014 -0700
+++ b/.hgsubstate	Mon Jul 21 10:52:20 2014 -0700
@@ -12,19 +12,19 @@
 33279476a63276cf5858a568283407dd98d7eb74 vim/bundle/haml
 27d5d85ab91889e045ba4be09e0858371cc69b7e vim/bundle/lawrencium
 5d965c221b90fb168bf9f447a332c9ff6f62e666 vim/bundle/less
-0ab83da0e11ca98ec0407b35c0a9e183f355616a vim/bundle/linediff
+b69e54f4bf0a0ee26f6582ee8764b25529610c88 vim/bundle/linediff
 61deff1362b5ea4c63eead77a52c51316fa7d433 vim/bundle/markdown
 b0bb781fc73ef40365e4c996a16f04368d64fc9d vim/bundle/nerdtree
 af8514b79c046a6bb447021b81351edb050ac69f vim/bundle/piecrust
 114f8e5c204f1cac9b2443065910fa182de39fb8 vim/bundle/powerline
-626a3a9d6faa029ea37d5b90e5067d8744f2ccfc vim/bundle/pythonmode
+c6a872a64530979f4aac46d765c577581cb7fc36 vim/bundle/pythonmode
 12e379989e3258af0934e10173386235c7d69944 vim/bundle/ragtag
 2a3c5f8e3c26a57b8eb4cfc4be79615a1c508ef6 vim/bundle/repeat
 528a59f26d12278698bb946f8fb82a63711eec21 vim/bundle/solarized
 7a32e0866bfea26cf7781935289df131d1d0c0e0 vim/bundle/supertab
 42e9b46e7a20a2f394664874c7bbd9d6f6c39e8a vim/bundle/surround
 ffe3085a804f6a668987af45ff5edf953ff2ff58 vim/bundle/syntastic
-dbc05b24a3da1541a211a2f6513777145258577a vim/bundle/tagbar
+614b5b244f3a7a9e0174ebcf73c809de6e62e32c vim/bundle/tagbar
 869c05195086dd1af9fe39e49621f9f880b6f07c vim/bundle/twig
 b9d1fa7d460dac878cbc8c945a45439d92ce0cb2 vim/bundle/vimroom
 a884f3a161fa3cd8c996eb53a3d1c68631f60c21 vim/bundle/yankring
diff -r 2c45098ada4f -r 896acf280e7a vim/vimrc
--- a/vim/vimrc	Sun Jul 20 21:47:11 2014 -0700
+++ b/vim/vimrc	Mon Jul 21 10:52:20 2014 -0700
@@ -555,7 +555,7 @@
 
 " Local override {{{
 
-let s:local_vimrc = s:vim_home.'/vimrc.local'
+let s:local_vimrc = s:vim_home.'/vimrc-local'
 if filereadable(s:local_vimrc)
     execute 'source' s:local_vimrc
 endif