# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1287522492 14400
# Node ID 4248c38099cc07bd61e3168990a21de5b976cbf9
# Parent  2215cbbb954ca80cda67a9c811ceee7ec67e790d# Parent  acbc504fc4e76e22449c79837b7566865a5ea3e6
Merge.

diff -r acbc504fc4e7 -r 4248c38099cc .hgignore
--- a/.hgignore	Fri Oct 15 18:05:00 2010 -0400
+++ b/.hgignore	Tue Oct 19 17:08:12 2010 -0400
@@ -9,3 +9,4 @@
 config/bcvi
 *.un~
 vim/tmp
+vim/bundle/gundo
diff -r acbc504fc4e7 -r 4248c38099cc vim/.vimrc
--- a/vim/.vimrc	Fri Oct 15 18:05:00 2010 -0400
+++ b/vim/.vimrc	Tue Oct 19 17:08:12 2010 -0400
@@ -273,6 +273,9 @@
 vnoremap <leader>rm :RopeExtractMethod<CR>
 noremap <leader>roi :RopeOrganizeImports<CR>
 
+" Gundo
+nnoremap <F5> :GundoToggle<CR>
+
 if has('gui_running')
     set guifont=Menlo:h12
     colorscheme molokai