vcs: fix title for base revision in merge

This commit is contained in:
Aleksey Pivovarov
2016-09-27 20:11:08 +03:00
committed by Aleksey Pivovarov
parent d256b8625c
commit b4551f6cc7
2 changed files with 2 additions and 1 deletions
@@ -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
@@ -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");
}
/**