Fix typo in git_status section (deleted != unmerged)

willnevillain commented 5 years ago

In the git status section, when one has unmerged files, the character for deleted files will appear in the git status section instead.

Description

Changed 'deleted' to 'unmerged' in the 'if unmerged' block

Motivation and Context

Show correct character in git status section when there are unmerged files.

Types of changes

[x] Bug fix (non-breaking change which fixes an issue)
[ ] New feature (non-breaking change which adds functionality)
[ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)

Screenshots (if appropriate):

Before: After:

How Has This Been Tested?

Created git repo with unmerged files (merge conflict), saw it displaying incorrect character, made the variable change, started new fish in the same git repo dir and saw it fixed.

[x] I have tested using MacOS
[ ] I have tested using Linux

Checklist:

[x] I have checked that no other PR duplicates mine
[x] My code follows the code style of this project.
[] My change requires a change to the documentation.
[] I have updated the documentation accordingly. (N/A)
[] I have updated the tests accordingly. (N/A)

matchai commented 5 years ago

:tada: This PR is included in version 2.2.3 :tada:

The release is available on GitHub release

Your semantic-release bot :package::rocket:

matchai commented 5 years ago

@all-contributors please add @dubnev for bug

allcontributors[bot] commented 5 years ago

@matchai

I've put up a pull request to add @dubnev! :tada:

matchai / spacefish