Suggestion on how to set up neovim as a diff/merge tool for git with dir-diff in mind

This page summarizes the projects mentioned and recommended in the original post on /r/neovim
Git Diff Neovim neovim-plugin diff-highlight

InfluxDB
Our great sponsors
  • InfluxDB - Power Real-Time Data Analytics at Scale
  • WorkOS - The modern identity platform for B2B SaaS
  • SaaSHub - Software Alternatives and Reviews
Our great sponsors

  • vim-fugitive

    fugitive.vim: A Git wrapper so awesome, it should be illegal

    Personally I've found fugitive's :Git mergetool command very useful

  • diff-so-fancy

    Good-lookin' diffs. Actually… nah… The best-lookin' diffs. :tada:

    I recently switched to diff-so-fancy for use in the terminal with the following configuration:

  • InfluxDB

    Power Real-Time Data Analytics at Scale. Get real-time insights from all types of time series data with InfluxDB. Ingest, query, and analyze billions of data points in real-time with unbounded cardinality.

  • diffview.nvim

    Single tabpage interface for easily cycling through diffs for all modified files for any git rev.

    Finally, I started using diffview plugin with the following configuration to handle merge conflicts in nvim:

NOTE: The number of mentions on this list indicates mentions on common posts plus user suggested alternatives. Hence, a higher number means a more popular project.

Suggest a related project

Related posts