From: D. Ben Knoble Date: Tue, 29 Sep 2026 11:08:22 GMT Subject: Re: [PATCH 2/5] xdiff: replace mmbuffer_t with mmfile_t Message-ID: In-Reply-To: <20260929065239.GB1697497@coredump.intra.peff.net> On Tue, Sep 29, 2026 at 2:57 AM Jeff King wrote: > > Our import of xdiff has two identical buffer structures: mmfile_t and > mmbuffer_t. In upstream xdiff these were actually different, but the > import in 3443546f6e (Use a *real* built-in diff generator, 2006-03-24) > simplified mmfile_t to a simple buffer. [snip] > I guess this step might be controversial, but I hope not. I think the > ship has long sailed on trying to pull "upstream" changes from xdiff > (there haven't been any, and we've hacked it up quite a bit already). I think for a while Vim has also pulled in xdiff from Git (since our copy is actively maintained), but I might have that wrong. I think they decided to stop doing so after the Rust bits merged? At any rate, I don't think that should be a strong (or even weak) objection to consolidating our code. Thanks.