finally merged with upstream

This commit is contained in:
Mike Hostetler 2011-03-16 14:56:04 -05:00
commit 23496fa683
90 changed files with 2442 additions and 270 deletions

View file

@ -10,5 +10,11 @@ setopt hist_verify
setopt inc_append_history
setopt extended_history
setopt hist_expire_dups_first
<<<<<<< HEAD
=======
setopt hist_ignore_space
setopt SHARE_HISTORY
>>>>>>> upstream/master
setopt APPEND_HISTORY