smerge-conflict-style
smerge-conflict-style is a variable defined in `smerge-mode.el
'.
Its value is nilDocumentation: Keep track of which style of conflict is in use. Can be nil if the style is undecided, or else: - `diff3-E' - `diff3-A'
smerge-mode.el
'.
Its value is nilDocumentation: Keep track of which style of conflict is in use. Can be nil if the style is undecided, or else: - `diff3-E' - `diff3-A'