diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-10-25 16:06:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-25 16:06:58 -0700 |
| commit | 6a1bb089fda35768b7649a91bf890e619c32e8e8 (patch) | |
| tree | 41f90efa6de206980f59b1256ac2df21fcfbff00 /lockfile.c | |
| parent | Merge branch 'fs/ssh-signing-fix' (diff) | |
| parent | mergetools/xxdiff: prevent segfaults from stopping difftool (diff) | |
| download | tgif-6a1bb089fda35768b7649a91bf890e619c32e8e8.tar.xz | |
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
Diffstat (limited to 'lockfile.c')
0 files changed, 0 insertions, 0 deletions