diff options
| author | Justin Donnelly <justinrdonnelly@gmail.com> | 2022-08-17 00:18:12 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-19 10:58:40 -0700 |
| commit | e03acd0d4ad75115f454041fac3300ae796f108f (patch) | |
| tree | 7ef09758c5d933c967f776a10d6ba8014d229963 /t/t9133-git-svn-nested-git-repo.sh | |
| parent | 795ea8776befc95ea2becd8020c7a284677b4161 (diff) | |
git-prompt: show presence of unresolved conflicts at command prompt
If GIT_PS1_SHOWCONFLICTSTATE is set to "yes", show the word "CONFLICT"
on the command prompt when there are unresolved conflicts.
Example prompt: (main|CONFLICT)
Signed-off-by: Justin Donnelly <justinrdonnelly@gmail.com>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9133-git-svn-nested-git-repo.sh')
0 files changed, 0 insertions, 0 deletions