Merge branch 'cherrypick'

Conflicts:
	platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java
	platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java

diff --cc platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java
index 8f36673d24178405256c3665e95714ef8bf32225,2a7c34868b722797a5f6ac918abfcfb038120b42..12834d4124ed15ee961b57725983af3c946e6cae
--- 1/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java
--- 2/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java
@@@ -151,15 -153,11 +153,25 @@@ public abstract class AbstractVcsHelpe
                                                                  final String singleFilePromptTemplate,
                                                                  final VcsShowConfirmationOption confirmationOption);
  
 +  @Nullable
 +  public Collection<FilePath> selectFilePathsToProcess(List<FilePath> files,
 +                                                                final String title,
 +                                                                @Nullable final String prompt,
 +                                                                final String singleFileTitle,
 +                                                                final String singleFilePromptTemplate,
 +                                                                final VcsShowConfirmationOption confirmationOption,
 +                                                                @Nullable String okActionName,
 +                                                                @Nullable String cancelActionName) {
 +    return selectFilePathsToProcess(files, title, prompt, singleFileTitle, singleFilePromptTemplate, confirmationOption);
 +  };
++  
++  
+   /**
+    * Shows commit dialog, fills it with the given changes and given commit message, initially selects the given changelist.
+    * @return true if user commits the changes, and commit succeeds; false if user presses Cancel or commit fails with errors.
+    */
+   public abstract boolean commitChanges(@NotNull List<Change> changes, @NotNull LocalChangeList initialChangeList,
+                                         @NotNull String commitMessage, @Nullable CommitExecutor executor);
+ 
++  
  }

diff --cc platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java
Simple merge

diff --cc platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java
index 1ae8907d3b65e1b20192b5ae929368c2261641df,3d36692ab4062847e888471ac86bd41528783cb2..52c75a6a300e03f2e5ef1cdef4a07ee63b04d7cb
--- 1/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java
--- 2/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java
@@@ -218,6 -213,6 +220,12 @@@ public class AbstractVcsHelperImpl exte
        }
      });
    }
++  
++  @Override
++  public boolean commitChanges(@NotNull List<Change> changes, @NotNull LocalChangeList initialChangeList,
++                               @NotNull String commitMessage, @Nullable CommitExecutor executor) {
++    return CommitChangeListDialog.commitChanges(myProject, changes, initialChangeList, executor, commitMessage);
++  }
  
    private void addDirectMessages(VcsErrorViewPanel vcsErrorViewPanel, List<VcsException> abstractVcsExceptions) {
      for (final VcsException exception : abstractVcsExceptions) {

diff --cc plugins/git4idea/src/git4idea/config/GitVcsPanel.java
Simple merge