ce91d22ff3b7

Merge.
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Tue, 15 Mar 2011 14:55:09 -0400
parents 5ca6eb1c7622 (current diff) cf7c23dfb060 (diff)
children b17bbc976855
branches/tags (none)
files

Changes

--- a/.hgignore	Mon Mar 14 09:31:12 2011 -0400
+++ b/.hgignore	Tue Mar 15 14:55:09 2011 -0400
@@ -17,3 +17,5 @@
 vim/spell
 fishd*
 fish_history
+bundle/vim-fugitive
+bundle/vermilion
--- a/.hgsubstate	Mon Mar 14 09:31:12 2011 -0400
+++ b/.hgsubstate	Tue Mar 15 14:55:09 2011 -0400
@@ -1,6 +1,6 @@
 b9bd86b9f476afd164237dce029a46d2607bd931 mercurial/templates
 b6be751b4b4391e7e25ba51e36300a8e04820846 vim/bundle/ack
-c839b22aa01560d8f25c7cbec13f93cb8fdcd4c5 vim/bundle/gundo
+89df25515c4c6febd19d619312b4aec096ff654a vim/bundle/gundo
 1535425d6987812aa87e2123d0e509b847b893d5 vim/bundle/html5
 34e28b3f6f6d702ff2963b8196eccae9344ed4bc vim/bundle/markdown
 930be32a23e902ddc46135ddbb9e76b0fac0c14b vim/bundle/nerdcommenter