mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 13:00:58 +00:00
git - use same icon for comparing as core diff editor
//cc @lszomoru
This commit is contained in:
parent
1adebec08e
commit
e8f26b998e
|
@ -2670,7 +2670,7 @@ export class CommandCenter {
|
|||
else if (item.previousRef === 'HEAD' && item.ref === '~') {
|
||||
title = localize('git.title.index', '{0} (Index)', basename);
|
||||
} else {
|
||||
title = localize('git.title.diffRefs', '{0} ({1}) ⟷ {0} ({2})', basename, item.shortPreviousRef, item.shortRef);
|
||||
title = localize('git.title.diffRefs', '{0} ({1}) ↔ {0} ({2})', basename, item.shortPreviousRef, item.shortRef);
|
||||
}
|
||||
|
||||
return {
|
||||
|
@ -2740,7 +2740,7 @@ export class CommandCenter {
|
|||
}
|
||||
|
||||
|
||||
const title = localize('git.title.diff', '{0} ⟷ {1}', leftTitle, rightTitle);
|
||||
const title = localize('git.title.diff', '{0} ↔ {1}', leftTitle, rightTitle);
|
||||
await commands.executeCommand('vscode.diff', selected.ref === '' ? uri : toGitUri(uri, selected.ref), item.ref === '' ? uri : toGitUri(uri, item.ref), title);
|
||||
}
|
||||
|
||||
|
|
|
@ -134,7 +134,7 @@ export default class CommandHandler implements vscode.Disposable {
|
|||
|
||||
const docPath = editor.document.uri.path;
|
||||
const fileName = docPath.substring(docPath.lastIndexOf('/') + 1); // avoid NodeJS path to keep browser webpack small
|
||||
const title = localize('compareChangesTitle', '{0}: Current Changes ⟷ Incoming Changes', fileName);
|
||||
const title = localize('compareChangesTitle', '{0}: Current Changes ↔ Incoming Changes', fileName);
|
||||
const mergeConflictConfig = vscode.workspace.getConfiguration('merge-conflict');
|
||||
const openToTheSide = mergeConflictConfig.get<string>('diffViewPosition');
|
||||
const opts: vscode.TextDocumentShowOptions = {
|
||||
|
|
Loading…
Reference in a new issue