Side by side file diffing

[kirawi]

No description provided.

[zbindenren]

Maybe delta can help in that case: https://github.com/dandavison/delta

It is the best terminal diff viewer I ever used and it is also written in rust.

[sudormrfbin]

Delta is a pager that acts on already diffed data (with - and + prepended to diffed lines like in the default git diff output) and simply applies syntax highlighting and better colors it. We will have to use similar for this, which we already use in helix to :reload the file from disk.

[archseer]

@pascalkuthe mentioned he'll probably pick up the work on this in the future after git gutter is merged.

[pascalkuthe]

After #3890 is merged, the main blocker will be rendering the diffs side by side (as a form of virtual text).
I am working with @kirawi to land the necessary changes in the rendering system to make that happen.

[LifeWorks]

Is this feature available in the current version? I see it is open, so I assume I still can not diff two buffers?

[archseer]

Yes, open issues typically indicate that a feature hasn't been implemented yet.

[wh75er]

Hello! Would it be possible to use inline git diff in one buffer? It would be amazing

[stevenxxiu]

Hello! Would it be possible to use inline git diff in one buffer? It would be amazing

Please open a separate issue for that.

[Dmole]

There are 2 uses cases I'd want helixdiff to handle:

• simple diff of 2 config files

• git conflictstyle diff3 which can use:

  vimdiff -f -d -c '4wincmd w | wincmd J' "$LOCAL" "$BASE" "$REMOTE" "$MERGED"

[DocteurFlashbios]

It would be really great to offer a more clear and advanced way to diff/merge files than vim. Either threeway merge is supported, but nothing is shown about who is who and I never managed to remember the "fingertricks"

[Dmole]

It would be really great to offer a more clear and advanced way to diff/merge files than vim. Either threeway merge is supported, but nothing is shown about who is who and I never managed to remember the "fingertricks"

Is
:ls
or
:set statusline=%n\ %f
not what you want?

[DocteurFlashbios]

It would be really great to offer a more clear and advanced way to diff/merge files than vim. Either threeway merge is supported, but nothing is shown about who is who and I never managed to remember the "fingertricks"

Is :ls or :set statusline=%n\ %f not what you want?

I thought about some vimdiff features like https://devhints.io/vim-diff
which are very usefull for merging files or branches

[gauteh]

Thanks for this great project! Just want to pitch in that diffing git revisions (fugitive functionality) and using helix as a difftool (to do reviewes or similar), fixing conflicts etc, would be really amazing. I don't really need a full git client (like committing etc, even logs), but I suppose those may be the easy parts.

[debajyoti1990]

It would be great if core developers take some time out to get this long pending feature request. 🙏

[JeftavanderHorst]

Keep in mind that helix is developed by volunteers with limited time. If you want a certain feature, you can create a pull request, no need to wait for the core developers to implement something. Helix has a very readable codebase which makes it relatively easy to get started, even if this would be your first contribution to open source.