diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-03-19 15:19:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-19 15:19:03 -0700 |
| commit | 3f5b4a7393b72902269bf06b5b94ede9fc5dee3d (patch) | |
| tree | d81e84bc6cc8245d605e0fca11e849acb97f3374 /git-merge-tree.html | |
| parent | 42ce67d67656af1241e4ef3aa4133991cccdafe6 (diff) | |
| download | git-htmldocs-3f5b4a7393b72902269bf06b5b94ede9fc5dee3d.tar.gz | |
Autogenerated HTML docs for v2.40.0-115-ge25ca
Diffstat (limited to 'git-merge-tree.html')
| -rw-r--r-- | git-merge-tree.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge-tree.html b/git-merge-tree.html index 1a12007d9..9d4a158bd 100644 --- a/git-merge-tree.html +++ b/git-merge-tree.html @@ -898,7 +898,7 @@ NUL</code></pre> <div class="content">
<pre><code>0: merge had conflicts
1: merge was clean
-&lt;0: something prevented the merge from running (e.g. access to repository
+<0: something prevented the merge from running (e.g. access to repository
objects denied by filesystem)</code></pre>
</div></div>
</div>
@@ -1152,7 +1152,7 @@ large repositories).</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-12-14 01:45:42 PST
+ 2023-03-19 15:16:41 PDT
</div>
</div>
</body>
|