diff --git a/platform/platform-resources-en/src/messages/VcsBundle.properties b/platform/platform-resources-en/src/messages/VcsBundle.properties index 1028a7613899..a5a7fb61dbe5 100644 --- a/platform/platform-resources-en/src/messages/VcsBundle.properties +++ b/platform/platform-resources-en/src/messages/VcsBundle.properties @@ -192,6 +192,7 @@ label.text.when.files.are.deleted.with.idea=When files are deleted with {0}: vcs.console.toolwindow.display.name=Console merge.version.title.local.changes=Local Changes merge.version.title.merge.result=Merge Result +merge.version.title.base.version=Base Version merge.version.title.last.version=Changes from Server merge.version.title.last.version.number=Changes from Server (revision {0}) dialog.title.clear.read.only.file.status=Clear Read-Only Status diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/merge/MergeDialogCustomizer.java b/platform/vcs-api/src/com/intellij/openapi/vcs/merge/MergeDialogCustomizer.java index 1d8fd2d654ad..61a583a5a8c2 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/merge/MergeDialogCustomizer.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/merge/MergeDialogCustomizer.java @@ -58,7 +58,7 @@ public class MergeDialogCustomizer { * @return title that is shown above the center panel in the 3-way merge dialog. "Merge result" by default. */ @Nullable public String getCenterPanelTitle(@NotNull VirtualFile file) { - return VcsBundle.message("merge.version.title.merge.result"); + return VcsBundle.message("merge.version.title.base.version"); } /**