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.

Sign up for GitHub

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

Jump to bottom

Map d2o d3o when diffthis during a merge conflict like fugitive does #650

Open
wodesuck opened this issue Oct 10, 2022 · 0 comments
Open

Map d2o d3o when diffthis during a merge conflict like fugitive does #650

wodesuck opened this issue Oct 10, 2022 · 0 comments
Labels
enhancement New feature or request

Comments

@wodesuck
Copy link

Is your feature request related to a problem? Please describe.
During a merge conflict, diffthis open a three-way diff, and dp do doesn't work because vim don't known which one to use. Fugitive :Gdiff map d2o d3o to obtain the hunk from "ours" or "theirs" ancestor.

Describe the solution you'd like
Map d2o d3o like fugitive.

Additional context
Fugitive do this in https://github.com/tpope/vim-fugitive/blob/dd8107cabf5fe85df94d5eedcae52415e543f208/autoload/fugitive.vim#L6515
@wodesuck wodesuck added the enhancement New feature or request label Oct 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@wodesuck