diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-06-30 12:50:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-06-30 12:50:46 -0700 |
| commit | 2e885d810467fba8853976f65c6b4f045581b2ca (patch) | |
| tree | 2f3658dc7e813712f944e781a1b491e036d58a25 /gitattributes.txt | |
| parent | ec07374e4b34e203be30a2a08a4aaeaabf162b29 (diff) | |
| download | git-htmldocs-2e885d810467fba8853976f65c6b4f045581b2ca.tar.gz | |
Autogenerated HTML docs for v2.41.0-236-g9748a
Diffstat (limited to 'gitattributes.txt')
| -rw-r--r-- | gitattributes.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gitattributes.txt b/gitattributes.txt index 02a3ec83e..6deb89a29 100644 --- a/gitattributes.txt +++ b/gitattributes.txt @@ -1132,7 +1132,10 @@ size (see below). The merge driver is expected to leave the result of the merge in the file named with `%A` by overwriting it, and exit with zero status if it managed to merge them cleanly, or non-zero if there -were conflicts. +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). The `merge.*.recursive` variable specifies what other merge driver to use when the merge driver is called for an internal |