[hg] rename merge command

plugins/hg4idea/src/org/zmlx/hg4idea/command/HgMergeCommand.java

@@ -56,7 +56,7 @@ public class HgMergeCommand {
   }
 
   @Nullable
-  private HgCommandResult execute() {
+  private HgCommandResult executeInCurrentThread() {
     HgPromptCommandExecutor commandExecutor = new HgPromptCommandExecutor(project);
     commandExecutor.setShowOutput(true);
     List<String> arguments = new LinkedList<String>();
@@ -76,8 +76,8 @@ public class HgMergeCommand {
   }
 
   @Nullable
-  public HgCommandResult merge() throws VcsException {
-    HgCommandResult commandResult = ensureSuccess(execute());
+  public HgCommandResult mergeSynchronously() throws VcsException {
+    HgCommandResult commandResult = ensureSuccess(executeInCurrentThread());
     try {
       HgUtil.markDirectoryDirty(project, repo.getRoot());
     }
@@ -109,7 +109,7 @@ public class HgMergeCommand {
       @Override
       public void run(@NotNull ProgressIndicator indicator) {
         try {
-          HgCommandResult result = hgMergeCommand.merge();
+          HgCommandResult result = hgMergeCommand.mergeSynchronously();
           if (HgErrorUtil.isAncestorMergeError(result)) {
             //skip and notify
             VcsNotifier.getInstance(project).notifyMinorWarning("Merging is skipped for " + repositoryRoot.getPresentableName(),

plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgRegularUpdater.java

@@ -214,7 +214,7 @@ public class HgRegularUpdater implements HgUpdater {
     //do not explicitly set the revision, that way mercurial itself checks that there are exactly
     //two heads in this branch
     //    mergeCommand.setRevision(headToMerge.getRevision());
-    return mergeCommand.merge();
+    return mergeCommand.mergeSynchronously();
   }
 
   private void processRebase(ProgressIndicator indicator, final UpdatedFiles updatedFiles) throws VcsException {