Merge d54c424218 into 07b9305d2f

2017-06-07 18:10:56 +00:00 · 2017-06-07 18:10:56 +00:00 · 20264fbb40
parent 07b9305d2f d54c424218
commit 20264fbb40
1 changed files with 5 additions and 0 deletions
--- a/aliases/available/general.aliases.bash
+++ b/aliases/available/general.aliases.bash
@ -40,6 +40,11 @@ alias cls='clear'
 alias edit="$EDITOR"
 alias pager="$PAGER"

+#Avoid clashes with TextWrangler's command line tools on OS X
+if [ -s /usr/local/bin/edit ] ; then
+  unalias edit
+fi
+
 alias q='exit'

 alias irc="$IRC_CLIENT"