diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-06-30 02:43:21 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-06-30 02:43:21 +0300 |
| commit | 3ea43bbe17b9f0d8ffcad17ce602d36ea0668ab8 (patch) | |
| tree | 256f0aebc98100cdf485b1c38b3dd2c74e7b8f90 /Documentation | |
| parent | a1264a08a1a6e0cd7e510c899cd0ba42dcf1045d (diff) | |
| parent | 34d765e736e015f5c4790db2c0a1d3ddbd4bd3e9 (diff) | |
Merge branch 'jc/abort-ll-merge-with-a-signal'
When the external merge driver is killed by a signal, its output
should not be trusted as a resolution with conflicts that is
proposed by the driver, but the code did.
* jc/abort-ll-merge-with-a-signal:
t6406: skip "external merge driver getting killed by a signal" test on Windows
ll-merge: killing the external merge driver aborts the merge
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/gitattributes.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 02a3ec83e4..6deb89a296 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/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 |