]> git.99rst.org Git - git.git/commitdiff
Merge branch 'da/mergetools-special-case-xxdiff-exit-128'
authorJunio C Hamano <redacted>
Mon, 25 Oct 2021 23:06:58 +0000 (16:06 -0700)
committerJunio C Hamano <redacted>
Mon, 25 Oct 2021 23:06:58 +0000 (16:06 -0700)
The xxdiff difftool backend can exit with status 128, which the
difftool-helper that launches the backend takes as a significant
failure, when it is not significant at all.  Work it around.

* da/mergetools-special-case-xxdiff-exit-128:
  mergetools/xxdiff: prevent segfaults from stopping difftool


Trivial merge
git clone https://git.99rst.org/PROJECT