search

sindrets / diffview.nvim

Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
Other
3.85k stars 105 forks source link

Feature: Use `'winbar'` to show context for merge conflicts #282

Closed meijieru closed 1 year ago

meijieru commented 1 year ago

When using the merge tool, it would be better to set the winbar as OURS, THEIRS, BASE.

sindrets commented 1 year ago

This is a good idea. It needs to be optional though, as people might have other things they would rather display in their winbar.