Merge remote-tracking branch 'dw-46/master'

2011-05-23 16:46:31 -04:00 · 2011-05-23 16:46:31 -04:00 · ccdaba3358
commit ccdaba3358
parent 8e50c66572 dac74f35e2
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -91,7 +91,7 @@ function git-config-joshs()
    git config --global core.pager 'less -FRXi'
    git config --global alias.dc 'diff --cached'
 }
-if [[ "$(which jsvn)" != "" ]]; then
+if [[ "$(which jsvn 2>/dev/null)" != "" ]]; then
    alias svn='jsvn'
 fi