tjdevries/diff-therapy.nvim

This is stars and forks stats for /tjdevries/diff-therapy.nvim repository. As of 07 May, 2024 this repository has 76 stars and 2 forks.

diff-therapy.nvim resolve those conflicts and have a happy relationship with git Goals Re-use as much as possible of :help diff, but also add new ways of looking at the conflicts and shortcuts for resolving them (that we can add locally to the buffer) 3-way merge of branches (shows you context of base branch) Use virtual text and virtual lines to provide additional context to the user Keyboard shortcut to choose left, choose right, choose base or modify Folding for diff (probably using builtin...