Skip to content
New issue

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

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

Already on GitHub? # to your account

TODO: inline merge instead of side-by-side #32

Closed
ptmcg opened this issue Oct 27, 2023 · 3 comments
Closed

TODO: inline merge instead of side-by-side #32

ptmcg opened this issue Oct 27, 2023 · 3 comments

Comments

@ptmcg
Copy link
Owner

ptmcg commented Oct 27, 2023

No description provided.

@sachinmyneni
Copy link

Did you mean "inline merge in addition to side-by-side"?
I came looking for that feature. I think both are great options for different contexts. To me, making inline as an option makes most sense.

@ptmcg
Copy link
Owner Author

ptmcg commented Dec 7, 2023

Did you mean "inline merge in addition to side-by-side"? I came looking for that feature. I think both are great options for different contexts. To me, making inline as an option makes most sense.

Yes, in 0.8.0 I'm adding a --inline option to view the merged files in a single inline column. Personally I've never liked this format, especially since you can create a virtual window as wide as you want and get horizontal scrolling with a scroll bar. But I just implemented that option today and I like how it has turned out (only works in interactive mode for now, going to wait to see if there is anyone interested in having --inline work for the --csv or --output formats. (I'm actually reluctant to add it to the CSV output form, I think the whole point of the CSV output is for pulling into some other application, not for human consumption.)

@ptmcg
Copy link
Owner Author

ptmcg commented Dec 7, 2023

Implemented in 0.8.0

@ptmcg ptmcg closed this as completed Dec 7, 2023
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants