diff options
Diffstat (limited to 'gitattributes.html')
| -rw-r--r-- | gitattributes.html | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gitattributes.html b/gitattributes.html index 9fcd7d64c..6d0024139 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -2003,7 +2003,10 @@ size (see below).</p></div> <div class="paragraph"><p>The merge driver is expected to leave the result of the merge in
the file named with <code>%A</code> by overwriting it, and exit with zero
status if it managed to merge them cleanly, or non-zero if there
-were conflicts.</p></div>
+were conflicts. When the driver crashes (e.g. killed by SEGV),
+it is expected to exit with non-zero status that are higher than
+128, and in such a case, the merge results in a failure (which is
+different from producing a conflict).</p></div>
<div class="paragraph"><p>The <code>merge.*.recursive</code> variable specifies what other merge
driver to use when the merge driver is called for an internal
merge between common ancestors, when there are more than one.
@@ -2243,7 +2246,7 @@ frotz unspecified</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2023-05-10 11:57:07 PDT
+ 2023-06-30 12:48:29 PDT
</div>
</div>
</body>
|