Mercurial > dotfiles

changeset 96:4c2c0fadab01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged changes.
author Ludovic Chabant <ludovic@chabant.com>
date Tue, 27 Mar 2012 20:31:33 -0700
parents b96ff0dd0137 (current diff) 9bf866c0bbb1 (diff)
children e6ecdb8ef62f
files
diffstat 4 files changed, 21 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsub	Thu Mar 22 18:43:08 2012 -0700
+++ b/.hgsub	Tue Mar 27 20:31:33 2012 -0700
@@ -22,5 +22,5 @@
 vim/bundle/lawrencium = ssh://hg@bitbucket.org/ludovicchabant/vim-lawrencium
 
 lib/hg/hg-git = ssh://hg@bitbucket.org/durin42/hg-git
-lib/hg/onsub = ssh://hg@bitbucket.org/aragost/onsub
+lib/hg/onsub = ssh://hg@bitbucket.org/ludovicchabant/onsub
 
--- a/.hgsubstate	Thu Mar 22 18:43:08 2012 -0700
+++ b/.hgsubstate	Tue Mar 27 20:31:33 2012 -0700
@@ -1,21 +1,21 @@
-32afa497834da2a702f14ff1100acfea3cd19cdc lib/hg/hg-git
-ef52038b4459ddd8c78f13c2789c658bbc6cacbc lib/hg/onsub
+163ac98569d35d36cee4e5737ae6772b41f5d1d3 lib/hg/hg-git
+5dc6ca31f9f3b04d12040867358a8bb8f98684bd lib/hg/onsub
 7d5b26907ce4e4d6de7ddf033fee82930733718c vim/bundle/badwolf
-c51066bd048ca47e9b6d1385703a4d3462ea8c93 vim/bundle/colorschemes
-62b72580aba57cb5185bd077ac7a905c1c6893ea vim/bundle/commentary
-ac56d68249ed551ea21f1f0cd6d0f0dacce4fe75 vim/bundle/ctrlp
+8108bffea8c65f10c99578b0edb424ce964d9048 vim/bundle/colorschemes
+50b055633580c65c381ebb310bc1786ff14e3340 vim/bundle/commentary
+c4fe3045653877518ddbe776a9cb7cbd4fdd0bc8 vim/bundle/ctrlp
 667a668e114e9ec0e5d4cbcb0962d835b23614c4 vim/bundle/easymotion
-c72a689f7f4deb7e7ad9947143383ada000476ae vim/bundle/fugitive
-91190e67720f852c17602504d5225d4e675b6499 vim/bundle/gundo
-a995d4aabb794bd60028537ecb41ca7f2c738e65 vim/bundle/haml
+4f7af188fec24330e7dff99c8758588ae9780347 vim/bundle/fugitive
+8078f3e3ed0f8a954d83ab35f238881e9fce479a vim/bundle/gundo
+3490c63d6827eb1c5fa31e51f090a7d6ca4bc563 vim/bundle/haml
 42c40b8144f833f0d08888eb692b75abb9ee6f48 vim/bundle/lawrencium
-2b18a534162bc2c3964cb3a8fe42ca8c100bb571 vim/bundle/markdown
-30f6bcc30caf76bc1213f5c3d4001ba5d5fbe7fc vim/bundle/nerdtree
+fdc0f091c78cd9a474ac3e3cf40ba7d6933ef9da vim/bundle/markdown
+678bb2816874d92bca4eea46e0f5f40a15ddab68 vim/bundle/nerdtree
 99277d9eed97a59cacc1db8c1dece2bcfd96d877 vim/bundle/powerline
-bdc8b580b5b583aeb43efb19aac2ab8ce5566dff vim/bundle/ragtag
-cdffdd43816ddaeee858ae42da3ab6ddcfa25d19 vim/bundle/repeat
+1b82b6726c9894acd37b70ec1cd451d412bdb0f7 vim/bundle/ragtag
+2914f11f7494adefaaec1d8c817a301c464c94b2 vim/bundle/repeat
 528a59f26d12278698bb946f8fb82a63711eec21 vim/bundle/solarized
-688b5d706c21fbc6b2db6499f3cfbdeb35309b5a vim/bundle/supertab
-4eb2cdfccc016889acfa3b5d63e8f390a87863cf vim/bundle/surround
-898981865f3473b5117362d0735c672ca75d39eb vim/bundle/syntastic
-0db7b49ebf86924573d340729e38c18bf78b0e89 vim/bundle/vimroom
+5a38ce8b600e11941f695523363fe04e6478549a vim/bundle/supertab
+489a1e8c676ad47dd358dbf883bfaf492148d38b vim/bundle/surround
+b4e85a87629c3db9900fed82f507c43d634fe7c0 vim/bundle/syntastic
+b9d1fa7d460dac878cbc8c945a45439d92ce0cb2 vim/bundle/vimroom
--- a/hgrc/hgignore	Thu Mar 22 18:43:08 2012 -0700
+++ b/hgrc/hgignore	Tue Mar 27 20:31:33 2012 -0700
@@ -1,4 +1,7 @@
 syntax: glob
 
 *~
+*.pyo
 .DS_Store
+Thumbs.db
+
--- a/hgrc/hgrc-Windows_NT	Thu Mar 22 18:43:08 2012 -0700
+++ b/hgrc/hgrc-Windows_NT	Tue Mar 27 20:31:33 2012 -0700
@@ -1,5 +1,5 @@
 [ui]
-#ssh="${userprofile}\Dropbox\Utilities\plink.exe" -ssh -i "${userprofile}\Dropbox\Personal\Security\PuTTY\key.ppk"
+ssh = "TortoisePlink.exe" -ssh -2 -batch -C
 
 [extensions]
 hggit = ${userprofile}\Code\BitBucket\HgGit\hggit