parent
0f19fa2d60
commit
c69c1719bb
2 changed files with 9 additions and 1 deletions
|
@ -123,6 +123,11 @@
|
||||||
"Below"
|
"Below"
|
||||||
],
|
],
|
||||||
"description": "%config.diffViewPosition%",
|
"description": "%config.diffViewPosition%",
|
||||||
|
"enumDescriptions": [
|
||||||
|
"%config.diffViewPosition.current%",
|
||||||
|
"%config.diffViewPosition.beside%",
|
||||||
|
"%config.diffViewPosition.below%"
|
||||||
|
],
|
||||||
"default": "Current"
|
"default": "Current"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,5 +16,8 @@
|
||||||
"config.autoNavigateNextConflictEnabled": "Whether to automatically navigate to the next merge conflict after resolving a 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.codeLensEnabled": "Create a Code Lens for merge conflict blocks within editor.",
|
||||||
"config.decoratorsEnabled": "Create decorators 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": "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."
|
||||||
}
|
}
|
Loading…
Reference in a new issue