From 00f4add770837789c9c33825487ffd8ed2ac7b3b Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Mon, 20 May 2019 21:02:01 +0300 Subject: [PATCH] cvs: restore support for mappings Fix regression after f3b725b51c3d09882680ced5f71ab52c75ba9c2d See 35d6ea3c76a5d851d40fa28bfab9fc3c2b0ca828 GitOrigin-RevId: b383819e6c950738c7d26207511d9a83f122e918 --- .../cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsVcs2.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsVcs2.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsVcs2.java index bb481077fd62..0e08bcbadf64 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsVcs2.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsVcs2.java @@ -374,6 +374,11 @@ public class CvsVcs2 extends AbstractVcs implements TransactionPr }; } + @Override + public boolean needsLegacyDefaultMappings() { + return true; + } + @Override public MergeProvider getMergeProvider() { if (myMergeProvider != null) {