search

akinsho / git-conflict.nvim

A plugin to visualise and resolve merge conflicts in neovim
1k stars 35 forks source link

[Feature Request] Per character diff highlight #44

Closed nikolasetiawan closed 1 year ago

nikolasetiawan commented 1 year ago

This plugin is fantastic... Used to hate resolving conflict. This makes it much more enjoyable.

Just one thing that might be missing. Would it be possible to highlight the per-character changes? Something like: Screenshot 2023-02-09 at 15 31 48 in a GitHub diff page. screenshot from https://github.com/akinsho/git-conflict.nvim/pull/31/files by the way

akinsho commented 1 year ago

@nikolasetiawan I would say that this is out of scope, because this plugin doesn't even do any diffing for starters it just highlights conflicted blocks based on the literal appearance of those markers in your code. This would be opening open a whole new feature set which I think is already well solved by gitsigns.nvim