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.html | |
| parent | 33be82183d4cd6dc645f64da1402cf9a3f4cdbf3 (diff) | |
| download | git-htmldocs-918a697459a240f82a16fba9fe7a606ed1d9c2a9.tar.gz | |
Autogenerated HTML docs for v2.42.0-526-g3130c1
Diffstat (limited to 'gitattributes.html')
| -rw-r--r-- | gitattributes.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gitattributes.html b/gitattributes.html index 6d0024139..e01ee4c67 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -2018,8 +2018,8 @@ will be stored via placeholder <code>%P</code>.</p></div> <div class="sect3">
<h4 id="_code_conflict_marker_size_code"><code>conflict-marker-size</code></h4>
<div class="paragraph"><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.</p></div>
+the work tree file during a conflicted merge. Only a positive
+integer has a meaningful effect.</p></div>
<div class="paragraph"><p>For example, this line in <code>.gitattributes</code> can be used to tell the merge
machinery to leave much longer (instead of the usual 7-character-long)
conflict markers when merging the file <code>Documentation/git-merge.txt</code>
@@ -2246,7 +2246,7 @@ frotz unspecified</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2023-06-30 12:48:29 PDT
+ 2023-10-30 08:42:00 JST
</div>
</div>
</body>
|