From: Justin Donnelly <justinrdonnelly@gmail.com>

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>

Submitted-As: https://lore.kernel.org/git/pull.1302.v2.git.1659132518935.gitgitgadget@gmail.com
In-Reply-To: https://lore.kernel.org/git/pull.1302.git.1658798595633.gitgitgadget@gmail.com