projects / idea / community.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e252995) | patch
IDEA-62060, IDEA-66050 MergeTool available for the whole project.
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Fri, 6 May 2011 15:50:17 +0000 (19:50 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Fri, 6 May 2011 16:00:29 +0000 (20:00 +0400)
commit554928a6035a29691d3f35eeecbdd865272e8e7c
tree427fee4db04ce1ffcd2da94d680d007162b81803tree
parente252995f8913b0e11db4c256c15d2d44ffff51a5commit | diff
IDEA-62060, IDEA-66050 MergeTool available for the whole project.

* MergeTool action is always visible.
* It is enabled, if there are unresolved merges in the project.
* GitAction will be the common ancestor for most git actions (BasicAction is overheaded and will be transferred from).
* MergeTool extends GitAction. And we don't need the list of files anymore.
plugins/git4idea/src/git4idea/actions/GitAction.java [new file with mode: 0644] blob
plugins/git4idea/src/git4idea/actions/GitMergeTool.java diff | blob | history
IntelliJ IDEA Community Edition and IntelliJ Platform.