From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Oct 2021 23:06:58 +0000 (-0700)
Subject: Merge branch 'da/mergetools-special-case-xxdiff-exit-128'
X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=6a1bb089fda35768b7649a91bf890e619c32e8e8;p=rit

Merge branch 'da/mergetools-special-case-xxdiff-exit-128'

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
---

6a1bb089fda35768b7649a91bf890e619c32e8e8