diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-03-18 16:20:49 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-03-18 16:20:49 -0700 |
commit | af4c62ae88d403a417ba7c2b879eca10e7bff8f4 (patch) | |
tree | c891b5836ffd51e72d12ad15fdb8599b214b5dcc /Documentation | |
parent | Name make_*_path functions more accurately (diff) | |
parent | docs: fix grammar in gitattributes.txt (diff) | |
download | tgif-af4c62ae88d403a417ba7c2b879eca10e7bff8f4.tar.xz |
Merge branch 'maint'
* maint:
docs: fix grammar in gitattributes.txt
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/gitattributes.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 7e7e12168e..15aebc6062 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -632,7 +632,7 @@ Performing a three-way merge `merge` ^^^^^^^ -The attribute `merge` affects how three versions of a file is +The attribute `merge` affects how three versions of a file are merged when a file-level merge is necessary during `git merge`, and other commands such as `git revert` and `git cherry-pick`. @@ -646,15 +646,15 @@ Unset:: Take the version from the current branch as the tentative merge result, and declare that the merge has - conflicts. This is suitable for binary files that does + conflicts. This is suitable for binary files that do not have a well-defined merge semantics. Unspecified:: By default, this uses the same built-in 3-way merge - driver as is the case the `merge` attribute is set. - However, `merge.default` configuration variable can name - different merge driver to be used for paths to which the + driver as is the case when the `merge` attribute is set. + However, the `merge.default` configuration variable can name + different merge driver to be used with paths for which the `merge` attribute is unspecified. String:: |