fixed issue with macvim / zsh -- an additional sudo mv /etc/zshenv /etc/zprofile helped

12 years ago · 671946f556
parent 409e55365b
commit 671946f556
3 changed files with 3 additions and 9 deletions
--- a/8
+++ b/8
@ -1,5 +1,5 @@
 [include]
-  path = .gitconfig.user
+  path = ~/.gitconfig.user

 [core]
  excludesfile = ~/.gitignore
@ -42,9 +42,3 @@
  lo = log --graph --decorate --pretty=oneline --abbrev-commit --all
  type = cat-file -t
  dump = cat-file -p
-[difftool "sourcetree"]
-	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
-	path = 
-[mergetool "sourcetree"]
-	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
-	trustExitCode = true
--- a/vim/bundle/tagbar
+++ b/vim/bundle/tagbar
@ -1 +1 @@
-Subproject commit ba6eb10e4990e33e1a9d98dcfcc22ff1fe0acaf5
+Subproject commit 63e689b64798b0d4cfdcfbea47570b6421b97abe
--- a/vim/bundle/tlib
+++ b/vim/bundle/tlib
@ -1 +1 @@
-Subproject commit d2eebd2f6b5b2fcca2fea9bb0b282cf13adea4a7
+Subproject commit a8be2f984248fe23b54cd42aa24bd4e8dbc150f4