diff --git a/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java b/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
index cc8cce768f9a..d5c4b3fa8505 100644
--- a/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
+++ b/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
@@ -110,22 +110,16 @@ public class GitCheckinEnvironment implements CheckinEnvironment {
     for (VirtualFile root : GitUtil.gitRoots(Arrays.asList(filesToCheckin))) {
       VirtualFile mergeMsg = root.findFileByRelativePath(GitRepositoryFiles.GIT_MERGE_MSG);
       VirtualFile squashMsg = root.findFileByRelativePath(GitRepositoryFiles.GIT_SQUASH_MSG);
-      VirtualFile normalMsg = root.findFileByRelativePath(GitRepositoryFiles.GIT_COMMIT_EDITMSG);
       try {
-        if (mergeMsg == null && squashMsg == null && normalMsg == null) {
+        if (mergeMsg == null && squashMsg == null) {
           continue;
         }
-
         String encoding = GitConfigUtil.getCommitEncoding(myProject, root);
-
         if (mergeMsg != null) {
           messages.add(loadMessage(mergeMsg, encoding));
         }
-        else if (squashMsg != null) {
-          messages.add(loadMessage(squashMsg, encoding));
-        }
         else {
-          messages.add(loadMessage(normalMsg, encoding));
+          messages.add(loadMessage(squashMsg, encoding));
         }
       }
       catch (IOException e) {