aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorWincent Colaiuta <win@wincent.com>2009-03-25 19:23:42 +0100
committerJunio C Hamano <gitster@pobox.com>2009-03-25 17:28:33 -0700
commit4fa535a179e771cd5a16d5ab05e97e7bb52739ef (patch)
tree8d304c37da17dc14a356b2e460b69fd012353386 /Documentation/git-merge.txt
parent98e1a4186acd4b71da1daae5c522cb6ac6d1d904 (diff)
downloadgit-4fa535a179e771cd5a16d5ab05e97e7bb52739ef.tar.gz
git-4fa535a179e771cd5a16d5ab05e97e7bb52739ef.tar.xz
Grammar fixes to "merge" and "patch-id" docs
Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index cc0d30fe7..427ad9083 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
-------------