linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-04-03 04:20:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Conflict merge 1

Browse source
This commit is contained in:
Preston Davis 2015-10-31 06:26:30 -04:00
commit 4d4fd1ba97
19 changed files with 1371 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/git-extras/git-extras.plugin.zsh
View file

@ -302,7 +302,11 @@ zstyle ':completion:*:*:git:*' user-commands \
count:'count commits' \
create-branch:'create local and remote branch' \
delete-branch:'delete local and remote branch' \
<<<<<<< HEAD
delete-merged-branches:'delete merged branches'\
=======
delete-merged-brancees:'delete merged branches'\
>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
delete-submodule:'delete submodule' \
delete-tag:'delete local and remote tag' \
effort:'display effort statistics' \