projects / idea / community.git / commit
| author | Kirill Likhodedov <kirill.likhodedov@jetbrains.com> | |
| Fri, 6 May 2011 15:55:51 +0000 (19:55 +0400) | ||
| committer | Kirill Likhodedov <kirill.likhodedov@jetbrains.com> | |
| Fri, 6 May 2011 16:00:30 +0000 (20:00 +0400) | ||
| commit | 80fd0d05432dfd46bab67f64bfe82f9f86bd28d0 | |
| tree | a1c8841dc57daa57b0d7ea804320b6d0f96e012f | tree |
| parent | 554928a6035a29691d3f35eeecbdd865272e8e7c | commit | diff |
| plugins/git4idea/src/META-INF/plugin.xml | diff | blob | history | |
| plugins/git4idea/src/git4idea/actions/GitResolveConflictsAction.java | [moved from plugins/git4idea/src/git4idea/actions/GitMergeTool.java with 97% similarity] | diff | blob | history |