MergeResultsView_conflictsOnly=true eclipse.preferences.version=1 merge_provider_set=true