[PATCH] Grammar fix for "git merge" man page
From: Wincent Colaiuta <hidden>
Date: 2016-06-15 22:46:28
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
As spotted by the eagle eyes of Jeff King. Signed-off-by: Wincent Colaiuta <redacted> --- Documentation/git-merge.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 427ad90..c04ae73 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt@@ -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
--
1.6.2.1