averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-23 12:14:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

git-pull doc: fix grammo ("conflicts" is plural)

Browse Source 
Signed-off-by: Mihai Capotă <mihai@mihaic.ro>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Mihai Capotă
2013-03-27 12:04:51 +01:00
committed by Junio C Hamano
parent e39c695d87
commit 38ef8a76e7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-pull.txt
View File

@@ -218,7 +218,7 @@ $ git merge origin/next
------------------------------------------------
If you tried a pull which resulted in a complex conflicts and
If you tried a pull which resulted in complex conflicts and
would want to start over, you can recover with 'git reset'.