# HG changeset patch
# User Edho Prima Arief <me@myconan.net>
# Date 1302879347 -25200
# Node ID 8eebbf68181cbff46566878296ce90f892f1f2d2
# Parent  a8dc309a1b8aa84c78546d4858d54f1b63a2d9e6# Parent  be694d1629c822ff2d01c6e4a1b96b52c8f9b010
Merge!

diff -r be694d1629c8 -r 8eebbf68181c hg
--- a/hg	Fri Apr 15 21:53:12 2011 +0700
+++ b/hg	Fri Apr 15 21:55:47 2011 +0700
@@ -1,6 +1,7 @@
 [ui]
 username = Edho Prima Arief <me@myconan.net>
 merge = vimdiff
+verbose = true
 
 [merge-tools]
 vimdiff.executable = vim
@@ -8,7 +9,4 @@
 
 [extensions]
 hgext.convert = 
-hgext.bookmarks =
-hgext.rebase =
-hggit =
-
+progress =
diff -r be694d1629c8 -r 8eebbf68181c tcsh
--- a/tcsh	Fri Apr 15 21:53:12 2011 +0700
+++ b/tcsh	Fri Apr 15 21:55:47 2011 +0700
@@ -91,6 +91,6 @@
 endsw
 unset gnuls_opts
 
-( which vim ) > /dev/null && alias vi vim
+( which vim ) > /dev/null && alias vi vim && setenv EDITOR vim
 
 [ -e "${HOME}/.tcsh_init.after" ] && source "${HOME}/.tcsh_init.after"
diff -r be694d1629c8 -r 8eebbf68181c vim
--- a/vim	Fri Apr 15 21:53:12 2011 +0700
+++ b/vim	Fri Apr 15 21:55:47 2011 +0700
@@ -14,3 +14,16 @@
 set ts=2
 set expandtab
 set title
+
+map <C-t><up> :tabr<cr>
+map <C-t><down> :tabl<cr>
+map <C-t><left> :tabp<cr>
+map <C-t><right> :tabn<cr>
+map <C-t>p :tabp<cr>
+map <C-t>n :tabn<cr>
+map <C-t><C-t> :NERDTreeToggle<cr>
+map <C-t><C-m> :NERDTreeMirror<cr>
+
+"autocmd VimEnter * NERDTree
+"autocmd BufEnter * NERDTreeMirror
+