API for showing merge dialog with auto-retrieving of merge provider (IDEADEV-29884)
commit7e8881ce42a40c0fcb7c98dd3a23befd3b2201b8
authorDmitry Jemerov <yole@intellij.com>
Fri, 5 Sep 2008 09:38:07 +0000 (5 13:38 +0400)
committerDmitry Jemerov <yole@intellij.com>
Fri, 5 Sep 2008 09:38:07 +0000 (5 13:38 +0400)
tree10a45a987ce252da9bd3a7b731d33ab1b691dcc8
parent60af3fd854028fd3efa6a9a3352589959801dc65
API for showing merge dialog with auto-retrieving of merge provider (IDEADEV-29884)
plugins/cvs2/source/com/intellij/cvsSupport2/CvsVcs2.java
vcs-api/src/com/intellij/openapi/vcs/AbstractVcs.java
vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java
vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java