IDEA-56303 Git Merge Tool renamed to Resolve Conflicts.
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Fri, 6 May 2011 15:55:51 +0000 (19:55 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Fri, 6 May 2011 16:00:30 +0000 (20:00 +0400)
plugins/git4idea/src/META-INF/plugin.xml
plugins/git4idea/src/git4idea/actions/GitResolveConflictsAction.java [moved from plugins/git4idea/src/git4idea/actions/GitMergeTool.java with 97% similarity]

index e5083e029bcb53b607060291de42eaf8e5463d3d..0caef5759a5a2c410578da72f554ecf05b346e13 100644 (file)
@@ -43,7 +43,7 @@
 
       <action id="Git.Tag" class="git4idea.actions.GitTag" text="Tag Files..."/>
       <action id="Git.Merge" class="git4idea.actions.GitMerge" text="Merge Changes..." icon="/vcs/mergeSourcesTree.png"/>
 
       <action id="Git.Tag" class="git4idea.actions.GitTag" text="Tag Files..."/>
       <action id="Git.Merge" class="git4idea.actions.GitMerge" text="Merge Changes..." icon="/vcs/mergeSourcesTree.png"/>
-      <action id="Git.MergeTool" class="git4idea.actions.GitMergeTool" text="Merge Tool..."/>
+      <action id="Git.ResolveConflicts" class="git4idea.actions.GitResolveConflictsAction" text="Resolve Conflicts..."/>
       <action id="Git.Stash" class="git4idea.actions.GitStash" text="Stash Changes..."/>
       <action id="Git.Unstash" class="git4idea.actions.GitUnstash" text="UnStash Changes..."/>
       <action id="Git.Reset" class="git4idea.actions.GitResetHead" text="Reset HEAD..." icon="/actions/reset.png"/>
       <action id="Git.Stash" class="git4idea.actions.GitStash" text="Stash Changes..."/>
       <action id="Git.Unstash" class="git4idea.actions.GitUnstash" text="UnStash Changes..."/>
       <action id="Git.Reset" class="git4idea.actions.GitResetHead" text="Reset HEAD..." icon="/actions/reset.png"/>
similarity index 97%
rename from plugins/git4idea/src/git4idea/actions/GitMergeTool.java
rename to plugins/git4idea/src/git4idea/actions/GitResolveConflictsAction.java
index 8d6b37205a681d2df495ab09946b6e0c952e4994..895624d9804ca0de300ff05b81f5d52b737275c4 100644 (file)
@@ -31,7 +31,7 @@ import java.util.*;
 /**
  * Git merge tool for resolving conflicts. Use IDEA built-in 3-way merge tool.
  */
 /**
  * Git merge tool for resolving conflicts. Use IDEA built-in 3-way merge tool.
  */
-public class GitMergeTool extends GitAction {
+public class GitResolveConflictsAction extends GitAction {
 
   @Override
   public void actionPerformed(@NotNull AnActionEvent event) {
 
   @Override
   public void actionPerformed(@NotNull AnActionEvent event) {