diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-03-19 01:35:35 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-03-19 01:35:35 +0000 |
| commit | fa28cb14513978502ac466090afe34c3479fc90b (patch) | |
| tree | 91489084678bd1e7cccc759a092caf7d453792be /gitattributes.txt | |
| parent | 8e2f6b1a4e99afe5bd1b61226a291d54bcc71446 (diff) | |
| download | git-htmldocs-fa28cb14513978502ac466090afe34c3479fc90b.tar.gz | |
Autogenerated HTML docs for v1.7.4.1-294-gaf4c
Diffstat (limited to 'gitattributes.txt')
| -rw-r--r-- | gitattributes.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gitattributes.txt b/gitattributes.txt index 7e7e12168..15aebc606 100644 --- a/gitattributes.txt +++ b/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:: |