`9e783c0a8e276e89d9d81951a4c32ea61dadccf1`

Author: Robby Russell <robby@planetargon.com>
Committer: Robby Russell <robby@planetargon.com>
Date: 2011-07-23 16:14 UTC

Message

fixing issue with last commit merge. missed a conflict

Diff

 1diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
 2index 3721d3343d73fd831a8eccc8a14b0283662e5580..5132b639afebcf2c722f1a4b6d31a43dd517774e 100644
 3--- a/plugins/git/git.plugin.zsh
 4+++ b/plugins/git/git.plugin.zsh
 5@@ -49,10 +49,6 @@ function current_branch() {
 6 alias ggpull='git pull origin $(current_branch)'
 7 compdef ggpull=git
 8 alias ggpush='git push origin $(current_branch)'
 9-<<<<<<< HEAD
10 compdef ggpush=git
11 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
12 compdef ggpnp=git
13-=======
14-alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
15->>>>>>> e5e032f... adding git svn aliases