From 4fa535a179e771cd5a16d5ab05e97e7bb52739ef Mon Sep 17 00:00:00 2001 From: Wincent Colaiuta Date: Wed, 25 Mar 2009 19:23:42 +0100 Subject: Grammar fixes to "merge" and "patch-id" docs Signed-off-by: Wincent Colaiuta Signed-off-by: Junio C Hamano --- Documentation/git-merge.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-merge.txt') diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index cc0d30fe7e..427ad9083e 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -41,7 +41,7 @@ include::merge-strategies.txt[] If you tried a merge which resulted in a complex conflicts and -would want to start over, you can recover with 'git-reset'. +want to start over, you can recover with 'git-reset'. CONFIGURATION ------------- -- cgit v1.2.1