d845a82775fb
Merge, dammit.
| author | Steve Losh <steve@stevelosh.com> |
|---|---|
| date | Wed, 09 Mar 2011 19:59:45 -0500 |
| parents | b2d5512b9b9b (diff) ff10804d581c (current diff) |
| children | cf7c23dfb060 |
| branches/tags | (none) |
| files | .hgrc .hgsubstate |
Changes
--- a/.hgignore Wed Mar 09 09:59:40 2011 -0500 +++ b/.hgignore Wed Mar 09 19:59:45 2011 -0500 @@ -17,3 +17,5 @@ vim/spell fishd* fish_history +bundle/vim-fugitive +bundle/vermilion
--- a/.hgrc Wed Mar 09 09:59:40 2011 -0500 +++ b/.hgrc Wed Mar 09 19:59:45 2011 -0500 @@ -18,7 +18,7 @@ schemes = progress = fetch = -hgsubversion = ~/lib/hg/hgsubversion/hgsubversion +#hgsubversion = ~/lib/hg/hgsubversion/hgsubversion attic = ~/lib/hg/hgattic/attic.py paste = ~/lib/hg/hg-paste/paste.py prompt = ~/lib/hg/hg-prompt/prompt.py
--- a/.hgsubstate Wed Mar 09 09:59:40 2011 -0500 +++ b/.hgsubstate Wed Mar 09 19:59:45 2011 -0500 @@ -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