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

feat: Show context for merge conflicts in the winbar #285

Closed sindrets closed 1 year ago

sindrets commented 1 year ago

Resolves #282

view.x.winbar_info                              *diffview-config-view.x.winbar_info*
        Type: `boolean`, Default: (see example config above)

        Use the 'winbar' to show contextual info about the different versions
        of a file in a diff.