This repository has been archived on 2022-03-28. You can view files and clone it, but cannot push or open issues or pull requests.
prezto/plugins/knife
Sorin Ionescu ba9900a488 Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Conflicts:
	.gitignore
	lib/aliases.zsh
	lib/completion.zsh
	lib/functions.zsh
	lib/git.zsh
	lib/key-bindings.zsh
	lib/misc.zsh
	lib/spectrum.zsh
	plugins/git/git.plugin.zsh
	plugins/osx/_man-preview
	plugins/osx/osx.plugin.zsh
	plugins/svn/svn.plugin.zsh
	templates/zshrc.zsh-template
	themes/lukerandall.zsh-theme
	themes/philips.zsh-theme
	tools/upgrade.sh
2011-08-26 02:58:19 -04:00
..
_knife Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh 2011-08-26 02:58:19 -04:00