1 files changed, 2 insertions, 1 deletions
diff --git a/prompt b/prompt
index 0cc25b1..428a892 100755
--- a/prompt
+++ b/prompt
@@ -264,7 +264,8 @@ PROMPT_COMMAND='
 
                             /^# Changed but not updated:/,/^# [A-Z]/ {
                                 s/^# Changed but not updated:/modified=modified/p
-                                s/#	modified:   /git_modified_files+=\" \"/p
+                                s/^#	modified:   /git_modified_files+=\" \"/p
+                                s/^#	unmerged:   /git_modified_files+=\" \"/p
                             }
 
                             /^# Changes to be committed:/,/^# [A-Z]/ {