vim-unimpaired icon indicating copy to clipboard operation
vim-unimpaired copied to clipboard

Published 20 hours ago • verified publisher icon tpope

Reveal full conflict on [n/]n

Open odnoletkov opened this issue 5 years ago • 2 comments

Much more useful than just a jump.

Also built-in [c/]c can be extended to reveal the full diff hunk. But that is more of a stretch maybe.

odnoletkov avatar Dec 14 '19 18:12 odnoletkov

Reveal? Does that mean scrolling, expanding folds, or something else?

tpope avatar Dec 14 '19 19:12 tpope

Scrolling. So that as much of the conflict is visible as possible. I always need to see the full conflict before I can do anything with it.

odnoletkov avatar Dec 14 '19 23:12 odnoletkov