docs(tips): add git alias tip for using DiffviewOpen as a merge tool#51
Merged
dlyongemallo merged 1 commit intomainfrom Mar 27, 2026
Merged
docs(tips): add git alias tip for using DiffviewOpen as a merge tool#51dlyongemallo merged 1 commit intomainfrom
DiffviewOpen as a merge tool#51dlyongemallo merged 1 commit intomainfrom
Conversation
There was a problem hiding this comment.
Pull request overview
Adds a new tip to the project’s tips/FAQ documentation describing how to invoke :DiffviewOpen from the command line via a Git alias, positioning Diffview as a workflow alternative to git mergetool during conflict resolution.
Changes:
- Document using
:DiffviewOpenfor merge conflict resolution workflows. - Provide a sample
~/.gitconfigalias (git diffview) to launch Neovim withDiffviewOpen.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
dlyongemallo
force-pushed
the
add_mergetool_tip
branch
from
0ed0abb to
690d9f4
Compare
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.
No description provided.