diff options
| author | Sam James <sam@gentoo.org> | 2023-08-29 01:50:11 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-08-29 01:51:32 +0100 |
| commit | 263e3d64adac1ee2968233e151d1ee590532f42d (patch) | |
| tree | 61137797a801b4e824ad05589c490b56f8007cb1 /.github | |
| parent | 9ea9cfe27f3debe4f97f3b04da6681fc3ae11b88 (diff) | |
| download | gentoolkit-263e3d64adac1ee2968233e151d1ee590532f42d.tar.gz | |
bin/merge-driver-ekeyword: fix compatibility with >=git-2.42.0
Commit 2b7b788fb31a74bcbff4e4c6efc6f3db6c3a49b7 upstream makes more use
of the result from a merge driver.
Correctly surface the result from `git merge-file` so that we don't wrongly
throw away information but also don't make git think the driver crashed (-1
is for exceptional cases, not "failed to merge").
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to '.github')
0 files changed, 0 insertions, 0 deletions