bin/vcs: Handle conflict states in git PS1

1 files changed, 1 insertions, 1 deletions

diff --git a/bin/vcs b/bin/vcs
index 73a29257..f633f5a9 100755
--- a/bin/vcs
+++ b/bin/vcs
@@ -102,7 +102,7 @@ git_ps1() {
 
 	HAS_DIFF=false
 	HAS_UNTRACKED=false
-	if printf '%s\n' "$DIFF_LINES" | grep -q '^[A|D|M|R| ][M|D| ]'; then
+	if printf '%s\n' "$DIFF_LINES" | grep -Eq '^([ADMRU ][MDU ]|[ADU][ADU])'; then
 		HAS_DIFF=true
 	fi
 	if printf '%s\n' "$DIFF_LINES" | grep -Eq '^([?][?]| A)'; then