{
	"": [
		"--------------------------------------------------------------------------------------------",
		"Copyright (c) Microsoft Corporation. All rights reserved.",
		"Licensed under the MIT License. See License.txt in the project root for license information.",
		"--------------------------------------------------------------------------------------------",
		"Do not edit this file. It is machine generated."
	],
	"version": "1.0.0",
	"contents": {
		"package": {
			"displayName": "Merge Conflict",
			"description": "Highlighting and commands for inline merge conflicts.",
			"command.category": "Merge Conflict",
			"command.accept.all-current": "Accept All Current",
			"command.accept.all-incoming": "Accept All Incoming",
			"command.accept.all-both": "Accept All Both",
			"command.accept.current": "Accept Current",
			"command.accept.incoming": "Accept Incoming",
			"command.accept.selection": "Accept Selection",
			"command.accept.both": "Accept Both",
			"command.next": "Next Conflict",
			"command.previous": "Previous Conflict",
			"command.compare": "Compare Current Conflict",
			"config.title": "Merge Conflict",
			"config.autoNavigateNextConflictEnabled": "Whether to automatically navigate to the next merge conflict after resolving a merge conflict.",
			"config.codeLensEnabled": "Create a Code Lens for merge conflict blocks within editor.",
			"config.decoratorsEnabled": "Create decorators for merge conflict blocks within editor.",
			"config.diffViewPosition": "Controls where the diff view should be opened when comparing changes in merge conflicts.",
			"config.diffViewPosition.current": "Open the diff view in the current editor group.",
			"config.diffViewPosition.beside": "Open the diff view next to the current editor group.",
			"config.diffViewPosition.below": "Open the diff view below the current editor group."
		},
		"dist/codelensProvider": {
			"acceptCurrentChange": "Accept Current Change",
			"acceptIncomingChange": "Accept Incoming Change",
			"acceptBothChanges": "Accept Both Changes",
			"compareChanges": "Compare Changes"
		},
		"dist/commandHandler": {
			"cursorNotInConflict": "Editor cursor is not within a merge conflict",
			"compareChangesTitle": "{0}: Current Changes ⟷ Incoming Changes",
			"cursorOnCommonAncestorsRange": "Editor cursor is within the common ancestors block, please move it to either the \"current\" or \"incoming\" block",
			"cursorOnSplitterRange": "Editor cursor is within the merge conflict splitter, please move it to either the \"current\" or \"incoming\" block",
			"noConflicts": "No merge conflicts found in this file",
			"noOtherConflictsInThisFile": "No other merge conflicts within this file"
		},
		"dist/mergeDecorator": {
			"currentChange": "(Current Change)",
			"incomingChange": "(Incoming Change)"
		}
	}
}