diff options
| author | Štěpán Němec <stepnem@smrk.net> | 2023-10-05 11:00:51 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-05 12:55:38 -0700 |
| commit | 97509a3497cf864bb1ed26229feb9437f76a30ee (patch) | |
| tree | a7441543bed3b954db8397960088d337ecdd51d8 /Documentation/gitattributes.txt | |
| parent | 3a06386e314565108ad56a9bdb8f7b80ac52fb69 (diff) | |
| download | git-97509a3497cf864bb1ed26229feb9437f76a30ee.tar.gz | |
doc: fix some typos, grammar and wording issues
Signed-off-by: Štěpán Němec <stepnem@smrk.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitattributes.txt')
| -rw-r--r-- | Documentation/gitattributes.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 6deb89a296..8c1793c148 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -1151,8 +1151,8 @@ will be stored via placeholder `%P`. ^^^^^^^^^^^^^^^^^^^^^^ This attribute controls the length of conflict markers left in -the work tree file during a conflicted merge. Only setting to -the value to a positive integer has any meaningful effect. +the work tree file during a conflicted merge. Only a positive +integer has a meaningful effect. For example, this line in `.gitattributes` can be used to tell the merge machinery to leave much longer (instead of the usual 7-character-long) |