This repository has been archived by the owner on Feb 3, 2021. It is now read-only.
Fix typo in git_status section (deleted != unmerged) #159
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
matchai
approved these changes
Feb 17, 2019
matchai
pushed a commit
that referenced
this pull request
Feb 17, 2019
## [2.2.3](v2.2.2...v2.2.3) (2019-02-17) ### Bug Fixes * git status section shows the correct symbol for unmerged ([#159](#159)) ([7c2a1d5](7c2a1d5))
|
🎉 This PR is included in version 2.2.3 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
|
@all-contributors please add @dubnev for bug |
|
I've put up a pull request to add @dubnev! 🎉 |
matchai
pushed a commit
that referenced
this pull request
Mar 2, 2019
Adds @dubnev as a contributor for bug. This was requested by matchai [in this comment](#159 (comment)) Co-authored-by: null <allcontributors[bot]@users.noreply.github.com>
adamsimp
pushed a commit
to adamsimp/spacefish
that referenced
this pull request
May 6, 2019
Adds @dubnev as a contributor for bug. This was requested by matchai [in this comment](matchai#159 (comment)) Co-authored-by: null <allcontributors[bot]@users.noreply.github.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
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.
Checklist: