From 4a993d873546e4f86b9d03bf7e8580bc973c34ed Mon Sep 17 00:00:00 2001
From: Martin Gondermann <magicmonty@users.noreply.github.com>
Date: Fri, 18 Sep 2015 16:28:29 +0200
Subject: [PATCH] Makes merge conflicts clearer

fixes #151
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 75663eb..09a24f9 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ The symbols are as follows:
 - Local Status Symbols
   - ``✔``: repository clean
   - ``●n``: there are ``n`` staged files
-  - ``✖n``: there are ``n`` unmerged files
+  - ``✖n``: there are ``n`` files with merge conflict(s)
   - ``✚n``: there are ``n`` changed but *unstaged* files
   - ``…n``: there are ``n`` untracked files
   - ``⚑n``: there are ``n`` stash entries