Repository navigation
feat: merge tool polish and :Differ continue - #66
Merged
Merged
Conversation
…t the branch review
…erge tool modules
undont
force-pushed
the
fix/mergetool-polish
branch
from
October 14, 2026 21:10
2e796eb to
3e72b9c
Compare
undont
marked this pull request as draft
October 14, 2026 21:23
undont
marked this pull request as ready for review
October 18, 2026 10:50
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
:Differ continuefinishes the merge, rebase, cherry-pick, revert or am in progress from nvim: continue, continue and edit the message, skip (confirmed) or abortgCon the panel, diff view and merge result opens the same "continue" menu: skip or abort while conflicts are left (abort only for a merge), continue once every conflict is resolved:wand close commits the message; closing unwritten or emptying it cancels that commit and leaves the operation stopped]f/[fsave, stage and step between conflicted files, and the winbar shows file and conflict progress(merging) topic → main) and how to continue itgit addno longer reports the file stagedHEADafter a commitTest plan
make checkclean (504 unit, 932 nvim, go)