Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Adding split diff view with icdiff #161

Closed
wants to merge 1 commit into from

Conversation

jesseduffield
Copy link
Owner

@jesseduffield jesseduffield commented Aug 16, 2018

I'm kinda tentative about this one. It looks awesome to have a split diff, but it's very slow. The only implementation that I could get working was one which used icdiff, meaning any user wanting to use that will need to install it separately. Given how slow it is, I don't think it should be used by default, and it sounds like a good candidate for a 'use split diff' user config value.

What are peoples' thoughts?

(the code as it is would need to actually add the configurable stuff, and I'll do that after the config PR gets merged - if we decide to go ahead with this)

splitdiffscreenshot

@glvr182
Copy link
Contributor

glvr182 commented Aug 17, 2018

Maybe you could make it a setting, speaking of which a settings file / view could maybe be used for all sorts of things (for example colorscheme and language). With this it would be like

"diff_strategy" : "side-by-side"

or

"diff_strategy" : "inline"

Design wise, it would look really crowded on smaller screens I suspect.

@jesseduffield
Copy link
Owner Author

Yeah that sounds good. I'll merge the user-config PR, then add this and make it explicit that you need icdiff installed for it to work

@jesseduffield jesseduffield changed the title Adding split diff view with icdiff WIP: Adding split diff view with icdiff Aug 21, 2018
@jesseduffield
Copy link
Owner Author

closing in favour of #201

@jesseduffield jesseduffield deleted the feature/split-diff branch March 20, 2023 02:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants