diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-30 08:44:11 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-30 08:44:11 +0900 |
| commit | 918a697459a240f82a16fba9fe7a606ed1d9c2a9 (patch) | |
| tree | 0ebdc5c599739be4b2c4fa4ebf0cfc1ebbbff565 /gitattributes.txt | |
| parent | 33be82183d4cd6dc645f64da1402cf9a3f4cdbf3 (diff) | |
| download | git-htmldocs-918a697459a240f82a16fba9fe7a606ed1d9c2a9.tar.gz | |
Autogenerated HTML docs for v2.42.0-526-g3130c1
Diffstat (limited to 'gitattributes.txt')
| -rw-r--r-- | gitattributes.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gitattributes.txt b/gitattributes.txt index 6deb89a29..8c1793c14 100644 --- a/gitattributes.txt +++ b/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) |