From b46a233a055b114fa92add71368396b5d95723b7 Mon Sep 17 00:00:00 2001
From: Martin Gondermann <magicmonty@users.noreply.github.com>
Date: Fri, 18 Sep 2015 16:29:14 +0200
Subject: [PATCH] Update git-prompt-help.sh

relates to #151
---
 git-prompt-help.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-prompt-help.sh b/git-prompt-help.sh
index 40e98cd..d15db0e 100755
--- a/git-prompt-help.sh
+++ b/git-prompt-help.sh
@@ -22,7 +22,7 @@ LOCALSTATUS is one of the following:
 
     ${GIT_PROMPT_CLEAN}${ResetColor} - repository clean
     ${GIT_PROMPT_STAGED}N${ResetColor} - N staged files
-    ${GIT_PROMPT_CONFLICTS}N${ResetColor} - N conflicted files
+    ${GIT_PROMPT_CONFLICTS}N${ResetColor} - N files with merge conflicts
     ${GIT_PROMPT_CHANGED}N${ResetColor} - N changed but *unstaged* files
     ${GIT_PROMPT_UNTRACKED}N${ResetColor} - N untracked files
     ${GIT_PROMPT_STASHED}N${ResetColor} - N stash entries