Using neovim as a git diff tool

• diffview.nvim

  61 3,363 6.1 Lua

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

Have you seen this new diff plugin? I know it's not really merge-conflict related persay, but it might help you in your step towards enjoying git integrations in Neovim better

• vim-mergetool

  6 281 0.0 Vim Script

  :cake: Efficient way of using Vim as a Git mergetool

• InfluxDB

  www.influxdata.com featured

  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.

  

• vim-conflicted

  2 271 0.0 Vim Script

  Easy git merge conflict resolution in Vim

I have been very happy with this one, I don't believe I have had to tweak it at all: https://github.com/christoomey/vim-conflicted

Suggest a related project