MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

typo [vcs-merge]: Proper text for merge dialog (IJPL-175152)

Browse Source 
GitOrigin-RevId: 089af0bb516b16f591ca673d50cd208d6f708e00
This commit is contained in:
Radu Nedelcu
2026-02-16 16:53:58 +00:00
committed by intellij-monorepo-bot
parent aaaca85416
commit ab415d506e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-api/resources/messages/DiffBundle.properties
+2 -2
View File
@@ -61,8 +61,8 @@ merge.dialog.accept.change.command=Accept change
merge.dialog.ignore.change.command=Ignore change
merge.dialog.reset.change.command=Reset resolved change
merge.dialog.resolve.conflict.command=Resolve conflict
merge.dialog.apply.non.conflicted.changes.command=Apply non conflicted changes
merge.dialog.ignore.all.changes=Apply non conflicted changes
merge.dialog.apply.non.conflicted.changes.command=Apply non-conflicting changes
merge.dialog.ignore.all.changes=Apply non-conflicting changes
patch.dialog.copy.change.command=Copy to clipboard
patch.dialog.copy.change.command.balloon=Copied to clipboard
# suppress inspection "UnusedProperty": used by 3-party plugins