From: Felipe Contreras Date: Sun, 13 Jun 2021 22:58:32 GMT Subject: [PATCH 0/4] merge: cleanups and fix Message-ID: <20210613225836.1009569-1-felipe.contreras@gmail.com> Investigating a crash with the proposed zdiff3 [1] I found some easy improvements in the merge/xmerge code and one crash fix. These should not cause any functional changes, even the fix doesn't affect any current code-paths. [1] https://lore.kernel.org/git/YMYnVWSEgxvKRU9j@coredump.intra.peff.net/ Felipe Contreras (4): merge: simplify initialization merge: fix Yoda conditions xdiff/xmerge: simplify xdl_recs_copy_0 xdiff/xmerge: fix chg0 initialization builtin/merge-file.c | 8 ++------ xdiff/xmerge.c | 30 ++++++++++++++++-------------- 2 files changed, 18 insertions(+), 20 deletions(-) -- 2.32.0