diff options
| author |  Wincent Colaiuta <win@wincent.com> | 2009-03-26 10:39:04 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-03-26 09:38:58 -0700 |
| commit | 9fe00538c693929d4dec29690fe7660106fe056a (patch) | |
| tree | 668b4ada1bd1856be21517332165679ccaebf337 /Documentation | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-9fe00538c693929d4dec29690fe7660106fe056a.tar.xz | |
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | 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 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 |