Repository navigation
[Feature request] Single panel vertical merging feature like in imediff3 or VSCode #256
Description
Hello, I'd like to know if you could add a single panel vertical merging feature like in imediff3 or VSCode.
It basically should look like this:
https://code.visualstudio.com/docs/sourcecontrol/overview?ref=lug.ao.st
For 3+ way merging, I find it way more easy to understand and use than multi panels.
For me VS Code diff and merging is kinda broken so I can't rely on it (it keeps the comment lines <<<< >>>> in the code).
Activity
joyously commentedon Aug 6, 2025
Doesn't this all exist in one file? And the point of Diffuse is to compare multiple files?
Perhaps you should look into trying Jujutsu, which has multiple ways to display the conflict sides, and often can resolve them for you.
F3llFr0mTh3Sky commentedon Aug 6, 2025
No, it is multiple files (different versions of the same file) compared vertically in a single file (editor tab) but it could also be completely different files too.
I'd tell you to try imediff3 or VS Code so you can understand better how it works.