pr-1302/justinrdonnelly/conflict-indicator-v3
tagged this
17 Aug 00:18
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.v3.git.1660695492382.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1302.git.1658798595633.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1302.v2.git.1659132518935.gitgitgadget@gmail.com
Assets 2
-
2022-08-17T00:18:12Z -
2022-08-17T00:18:12Z -