Justin Donnelly e03acd0d4a 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>		2022-08-19 10:58:40 -07:00
..
.gitattributes
git-completion.bash
git-completion.tcsh
git-completion.zsh
git-prompt.sh	git-prompt: show presence of unresolved conflicts at command prompt	2022-08-19 10:58:40 -07:00