From 9fe00538c693929d4dec29690fe7660106fe056a Mon Sep 17 00:00:00 2001 From: Wincent Colaiuta Date: Thu, 26 Mar 2009 10:39:04 +0100 Subject: [PATCH 1/1] Grammar fix for "git merge" man page As spotted by the eagle eyes of Jeff King. Signed-off-by: Wincent Colaiuta Signed-off-by: Junio C Hamano --- Documentation/git-merge.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 427ad9083e..c04ae739ed 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 -- 2.43.2