git-pull doc: fix grammo ("conflicts" is plural)
Signed-off-by: Mihai Capotă <mihai@mihaic.ro> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Mihai Capotă committed
Mar 27, 2013 at 12:04 UTC
38ef8a76e7c8c3e1be6e6ae96cfccc4191e9eac8
1 file changed
+1
-1
Documentation/git-pull.txt
+1
-1
@@ -218,7 +218,7 @@ $ git merge origin/next
218
------------------------------------------------
219
220
221
-If you tried a pull which resulted in a complex conflicts and
221
+If you tried a pull which resulted in complex conflicts and
222
would want to start over, you can recover with 'git reset'.
223
224