forked from git/git
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
git-prompt: show 'CONFLICT' indicator at command prompt
When there are unresolved conflicts, show the word 'CONFLICT' on the command prompt. Similar to other state indicators, this provides information to the user about the current state of the repository. Example prompt: (main|CONFLICT) Signed-off-by: Justin Donnelly <justinrdonnelly@gmail.com>
- Loading branch information
1 parent
6a475b7
commit e380826
Showing
2 changed files
with
15 additions
and
5 deletions.
There are no files selected for viewing
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
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