docs: fix grammar in gitattributes.txt
[jc: with a fixlet from Marc Branchaud] Signed-off-by: Alexei Sholik <alcosholik@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Alexei Sholik committed
Mar 18, 2011 at 15:14 UTC
b547ce0b184f152938f2ea709b9932fa0d6181f8
1 file changed
+5
-5
Documentation/gitattributes.txt
+5
-5
@@ -632,7 +632,7 @@ Performing a three-way merge
632
`merge`
633
^^^^^^^
634
635
-The attribute `merge` affects how three versions of a file is
635
+The attribute `merge` affects how three versions of a file are
636
merged when a file-level merge is necessary during `git merge`,
637
and other commands such as `git revert` and `git cherry-pick`.
638
@@ -646,15 +646,15 @@ Unset::
646
647
Take the version from the current branch as the
648
tentative merge result, and declare that the merge has
649
- conflicts. This is suitable for binary files that does
649
+ conflicts. This is suitable for binary files that do
650
not have a well-defined merge semantics.
651
652
Unspecified::
653
654
By default, this uses the same built-in 3-way merge
655
- driver as is the case the `merge` attribute is set.
656
- However, `merge.default` configuration variable can name
657
- different merge driver to be used for paths to which the
655
+ driver as is the case when the `merge` attribute is set.
656
+ However, the `merge.default` configuration variable can name
657
+ different merge driver to be used with paths for which the
658
`merge` attribute is unspecified.
659
660
String::