diff options
Diffstat (limited to 'technical/api-merge.html')
| -rw-r--r-- | technical/api-merge.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/technical/api-merge.html b/technical/api-merge.html index a8b4bde2e..8ce0e62e3 100644 --- a/technical/api-merge.html +++ b/technical/api-merge.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>merge API</h1>
-<span id="revdate">2023-06-26</span>
+<span id="revdate">2023-06-29</span>
</div>
<div id="content">
<div id="preamble">
@@ -788,13 +788,13 @@ and <code>diff.c</code> for examples.</p></div> </p>
</li>
</ul></div>
-<div class="paragraph"><p>Check ll-merge.h for details.</p></div>
+<div class="paragraph"><p>Check merge-ll.h for details.</p></div>
</div>
</div>
<div class="sect1">
<h2 id="_low_level_single_file_merge">Low-level (single file) merge</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Check ll-merge.h for details.</p></div>
+<div class="paragraph"><p>Check merge-ll.h for details.</p></div>
</div>
</div>
</div>
@@ -802,7 +802,7 @@ and <code>diff.c</code> for examples.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 15:02:33 PDT
+ 2023-06-30 12:48:29 PDT
</div>
</div>
</body>
|