Change:
import { localize } from 'vs/nls'; import { registerColor } from 'vs/platform/theme/common/colorRegistry'; <del> export const modifiedBaseRangeInput1 = registerColor( 'mergeEditor.modifiedBaseRange.input1', </del> <ins> export const diff = registerColor( 'mergeEditor.diff', </ins> { <del> dark: '#a44c9d53', light: '#a44c9d38', hcDark: '#a44c9d53', hcLight: '#a44c9d38', </del> <ins> dark: '#9bb95533', light: '#9bb95533', hcDark: '#9bb95533', hcLight: '#9bb95533', </ins> }, localize( <del> 'mergeEditor.modifiedBaseRange.input1', 'The foreground color for changes in input 1.' </del> <ins> 'mergeEditor.diff', 'The foreground color for changes.' </ins> ) ); <del> export const modifiedBaseRangeInput2 = registerColor( 'mergeEditor.modifiedBaseRange.input2', </del> <ins> export const diffWord = registerColor( 'mergeEditor.diff.word', </ins> { <del> dark: '#878feb53', light: '#878feb53', hcDark: '#878feb53', hcLight: '#878feb53', </del> <ins> dark: '#9bb9551e', light: '#9bb9551e', hcDark: '#9bb9551e', hcLight: '#9bb9551e', </ins> }, localize( <del> 'mergeEditor.modifiedBaseRange.input2', 'The foreground color for changes in input 2.' </del> <ins> 'mergeEditor.diff.word', 'The foreground color for word changes.' </ins> ) ); <del> export const modifiedBaseRangeCombination = registerColor( 'mergeEditor.modifiedBaseRange.combination', </del> <ins> export const conflictBorderUnhandledUnfocused = registerColor( 'mergeEditor.conflictBorder.unhandledUnfocused', </ins> { <del> dark: '#8a4d249e', light: '#8a4d243e', hcDark: '#8a4d249e', hcLight: '#8a4d243e', </del> <ins> dark: '#ffa6007a', light: '#ffa6007a', hcDark: '#ffa6007a', hcLight: '#ffa6007a', </ins> }, localize( <del> 'mergeEditor.modifiedBaseRange.combination', 'The foreground color for combined changes in the result editor.' </del> <ins> 'mergeEditor.conflictBorder.unhandledUnfocused', 'The border color of unhandled unfocused conflicts.' </ins> ) ); <del> export const diffInput1 = registerColor( 'mergeEditor.diff.input1', </del> <ins> export const conflictBorderUnhandledFocused = registerColor( 'mergeEditor.conflictBorder.unhandledFocused', </ins> { <del> dark: '#e571db21', light: '#e571db21', hcDark: '#e571db21', hcLight: '#e571db21', </del> <ins> dark: '#ffa600', light: '#ffa600', hcDark: '#ffa600', hcLight: '#ffa600', </ins> }, localize( <del> 'mergeEditor.diff.input1', 'The foreground color for changed words in input 1.' </del> <ins> 'mergeEditor.conflictBorder.unhandledFocused', 'The border color of unhandled focused conflicts.' </ins> ) ); <del> export const diff = registerColor( 'mergeEditor.diff', </del> <ins> export const conflictBorderHandledUnfocused = registerColor( 'mergeEditor.conflictBorder.handledUnfocused', </ins> { <del> dark: '#d3d3d321', light: '#d3d3d321', hcDark: '#d3d3d321', hcLight: '#d3d3d321', </del> <ins> dark: '#86868649', light: '#86868649', hcDark: '#86868649', hcLight: '#86868649', </ins> }, localize( <del> 'mergeEditor.diff', 'The foreground color for changes in the result.' </del> <ins> 'mergeEditor.conflictBorder.handledUnfocused', 'The border color of handled unfocused conflicts.' </ins> ) ); <del> export const diffWord = registerColor( 'mergeEditor.diff.word', </del> <ins> export const conflictBorderHandledFocused = registerColor( 'mergeEditor.conflictBorder.handledFocused', </ins> { <del> dark: '#e571db21', light: '#e571db21', hcDark: '#e571db21', hcLight: '#e571db21', </del> <ins> dark: '#c1c1c1cc', light: '#c1c1c1cc', hcDark: '#c1c1c1cc', hcLight: '#c1c1c1cc', </ins> }, localize( <del> 'mergeEditor.diff.word', 'The foreground color for word changes in the result.' </del> <ins> 'mergeEditor.conflictBorder.handledFocused', 'The border color of handled focused conflicts.' </ins> ) ); <del> export const diffInput2 = registerColor( 'mergeEditor.diff.input2', { dark: '#878feb53', light: '#878feb53', hcDark: '#878feb53', hcLight: '#878feb53', }, localize( 'mergeEditor.diff.input2', 'The foreground color for changed words in input 2.' ) ); </del> export const handledConflictMinimapOverViewRulerColor = registerColor( 'mergeEditor.conflict-handled.minimapOverViewRuler',

Discussion:
I really like how I can see the word-level change per line now in the merge editor, but shouldn't the colors be identical to the diff editor? !
I agree the new color needs to be tweaked. Would you also use the green background?
I think making this look as close as a diff editor if possible would be nice because I am so used at looking at diffs with their color coding. //cc