mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Grammar fix for "git merge" man page
As spotted by the eagle eyes of Jeff King. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
eed1fcd76d
commit
9fe00538c6
|
@ -40,7 +40,7 @@ include::merge-options.txt[]
|
|||
include::merge-strategies.txt[]
|
||||
|
||||
|
||||
If you tried a merge which resulted in a complex conflicts and
|
||||
If you tried a merge which resulted in complex conflicts and
|
||||
want to start over, you can recover with 'git-reset'.
|
||||
|
||||
CONFIGURATION
|
||||
|
|
Loading…
Reference in a new issue