From 6a7a70f5eb66440c968699e90571db6c4c7537a4 Mon Sep 17 00:00:00 2001
From: Philip Jagielski <philipjagielski@gmail.com>
Date: Mon, 18 Jan 2016 13:51:41 -0600
Subject: [PATCH] Fix plurality in README

Otherwise it would be more correct to say file(s) with merge conflict(s).
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ff694b1..2a5ad6a 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`` files with merge conflict(s)
+  - ``✖n``: there are ``n`` files with merge conflicts
   - ``✚n``: there are ``n`` changed but *unstaged* files
   - ``…n``: there are ``n`` untracked files
   - ``⚑n``: there are ``n`` stash entries