plugins.diffview.view.mergeTool.disableDiagnostics
Temporarily disable diagnostics for conflict buffers while in the view.
Type: null or boolean or raw lua code
Default:
null
Plugin default: true
Declared by:
plugins.diffview.view.mergeTool.layout
Config for conflicted files in diff views during a merge or rebase. Configure the layout and behavior of different types of views. For more info, see ‘:h diffview-config-view.x.layout’.
- A: OURS (current branch)
- B: LOCAL (the file as it currently exists on disk)
- C: THEIRS (incoming branch)
- D: BASE (common ancestor)
diff1_plain:
B
diff3_horizontal:
A | B | C
diff3_vertical:
A
B
C
diff3_mixed:
A | C
B
diff4_mixed:
A | D | C
B
Type: null or one of “diff1_plain”, “diff3_horizontal”, “diff3_vertical”, “diff3_mixed”, “diff4_mixed” or raw lua code
Default:
null
Plugin default: "diff3_horizontal"
Declared by:
plugins.diffview.view.mergeTool.winbarInfo
See ‘:h diffview-config-view.x.winbar_info’
Type: null or boolean or raw lua code
Default:
null
Plugin default: true
Declared by: