public void mergeCommit(@NotNull VirtualFile root) throws VcsException {
    GitLineHandler handler = new GitLineHandler(myProject, root, GitCommand.COMMIT);
    handler.setStdoutSuppressed(false);

    GitRepository repository = GitUtil.getRepositoryForRoot(myProject, root);
    File messageFile = repository.getRepositoryFiles().getMergeMessageFile();
    if (!messageFile.exists()) {
      final GitBranch branch = repository.getCurrentBranch();
      final String branchName = branch != null ? branch.getName() : "";
      handler.addParameters("-m", "Merge branch '" + branchName + "' of " + root.getPresentableUrl() + " with conflicts.");
    } else {
      handler.addParameters("-F");
      handler.addAbsoluteFile(messageFile);
    }
    handler.endOptions();
    Git.getInstance().runCommand(handler).throwOnError();
  }
public void mergeCommit(@NotNull VirtualFile root)