]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ef16391 571f434)
Merge branch 'da/mergetools-special-case-xxdiff-exit-128'
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Oct 2021 23:06:58 +0000 (16:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Oct 2021 23:06:58 +0000 (16:06 -0700)
commit6a1bb089fda35768b7649a91bf890e619c32e8e8
tree41f90efa6de206980f59b1256ac2df21fcfbff00tree | snapshot
parentef1639145de771d33fe5b919f13debaaeaca35f7commit | diff
parent571f4348dd845fd4eccc6b19d93a7b422ed1a466commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.