being able to customize the chunking/diffing process with something analogous to an lsp would greatly improve this. In my experience a particularly horribly han

being able to customize the chunking/diffing process with something analogous to an lsp would greatly improve this. In my experience a particularly horribly handled case is when eg two branches add two distinct methods/functions in the same file location (especially if there is some boilerplate so that the two blocks share more than a few lines). a language aware merge could instead produce >>>> function foo(){ ... } ===== function bar(){ ... } <<<<<<