public @Nullable HgCommandResult mergeSynchronously() throws VcsException {
    HgCommandResult commandResult = ensureSuccess(executeInCurrentThread());
    HgUtil.markDirectoryDirty(project, repo.getRoot());
    return commandResult;
  }
public @Nullable HgCommandResult mergeSynchronously()