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

This commit is contained in:
Josh Holtrop 2011-05-23 16:46:31 -04:00
commit ccdaba3358

View File

@ -91,7 +91,7 @@ function git-config-joshs()
git config --global core.pager 'less -FRXi' git config --global core.pager 'less -FRXi'
git config --global alias.dc 'diff --cached' git config --global alias.dc 'diff --cached'
} }
if [[ "$(which jsvn)" != "" ]]; then if [[ "$(which jsvn 2>/dev/null)" != "" ]]; then
alias svn='jsvn' alias svn='jsvn'
fi fi