-
Notifications
You must be signed in to change notification settings - Fork 19
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
Use hunks from both 1 and 2 #30
Comments
It is not possible to do automatically. You'd have to copy/paste the values manually. I've been looking into this as well, would be really useful to be able to type like this: which would append the content of buffer 1 to the current result file. So you could do stuff like: to first take the change from 1 and then append the change from 2. Unfortunately vimdiff, which splice.vim uses under the hood, only has two basic commands; Identifying the current conflict and appending it's value to the result buffer is certainly doable but not through existing vimdiff commands. |
Would love this as well, +1! |
The latest release of the pure vim9script port of splice, https://github.com/errael/splice9/releases/tag/v1.0.0-beta2, supports this feature. |
I'm able to select a hunk for a conflict from either 1 or 2 but can't seem to add both files' hunks to the result file.
Is this possible?
The text was updated successfully, but these errors were encountered: