Is there a better way to see git diff in vim?

• conflict-marker.vim

  6 460 0.0 Vim Script

  Weapon to fight against conflicts in Vim.

• diffconflicts

  16 380 2.4 Vim Script

  A better Vimdiff Git mergetool

I end up using https://github.com/whiteinge/diffconflicts it does the job I have looked for, I have adjusted the way it a bit to look more like 3 splits solver rather with 2 splits.

• InfluxDB

  www.influxdata.com sponsored

  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-mergetool

  6 281 0.0 Vim Script

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

You should also try vim-mergetool .

Suggest a related project