# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1333083192 25200
# Node ID e6ecdb8ef62f46d4373e1044d4d85ec3a573ae01
# Parent  4c2c0fadab016d381e81da2c54cd6a1ec861b81f# Parent  822fc8b4405f1628eb317c42ec22c5b098af436e
Merged changes.

diff -r 4c2c0fadab01 -r e6ecdb8ef62f .hgsubstate
--- a/.hgsubstate	Tue Mar 27 20:31:33 2012 -0700
+++ b/.hgsubstate	Thu Mar 29 21:53:12 2012 -0700
@@ -1,5 +1,5 @@
 163ac98569d35d36cee4e5737ae6772b41f5d1d3 lib/hg/hg-git
-5dc6ca31f9f3b04d12040867358a8bb8f98684bd lib/hg/onsub
+d920e3425db554497a2cfaf1a2548eafbdc8b0e7 lib/hg/onsub
 7d5b26907ce4e4d6de7ddf033fee82930733718c vim/bundle/badwolf
 8108bffea8c65f10c99578b0edb424ce964d9048 vim/bundle/colorschemes
 50b055633580c65c381ebb310bc1786ff14e3340 vim/bundle/commentary
diff -r 4c2c0fadab01 -r e6ecdb8ef62f hgrc/hgrc-Windows_NT
--- a/hgrc/hgrc-Windows_NT	Tue Mar 27 20:31:33 2012 -0700
+++ b/hgrc/hgrc-Windows_NT	Thu Mar 29 21:53:12 2012 -0700
@@ -1,9 +1,6 @@
 [ui]
 ssh = "TortoisePlink.exe" -ssh -2 -batch -C
 
-[extensions]
-hggit = ${userprofile}\Code\BitBucket\HgGit\hggit
-
 [extdiff]
 cmds.wdiff = "C:\Program Files (x86)\WinMerge\WinMergeU.exe"
 
diff -r 4c2c0fadab01 -r e6ecdb8ef62f vim/vimrc
--- a/vim/vimrc	Tue Mar 27 20:31:33 2012 -0700
+++ b/vim/vimrc	Thu Mar 29 21:53:12 2012 -0700
@@ -153,6 +153,9 @@
 " Going left and right let you go to other lines.
 set whichwrap+=<,>,h,l
 
+" How to show invisible characters
+set listchars=eol:$,tab:>-,trail:-,extends:>,precedes:<,nbsp:%,conceal:.
+
 " Folds are defined by markers in the text.
 set foldmethod=marker
 
@@ -262,7 +265,7 @@
 nnoremap <C-right> :wincmd l<cr>
 
 " Open NERDtree.
-nnoremap <F2> :NERDTreeToggle<cr>
+nnoremap <F2> :NERDTreeToggle %:p:h<cr>
 
 " Switch buffers.
 nnoremap <F3> :execute ("buffer " . bufname("#"))<cr>