VCS: Colorize unmerged files in submit editor

So far, conflicted files were displayed like added ones.

Now they are marked obvious, as they disable the commit button.

Task-number: QTCREATORBUG-16297
Change-Id: Iedf834408a747c4fe5f2133790c5fb81e7fea265
Reviewed-by: Hugues Delorme <delorme.hugues@fougue.pro>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

src/plugins/git/gitsubmiteditor.cpp

@@ -142,6 +142,8 @@ void GitSubmitEditor::setCommitData(const CommitData &d)
                                     -> SubmitFileModel::FileStatusHint
     {
         const FileStates state = static_cast<FileStates>(extraData.toInt());
+        if (state & (UnmergedFile | UnmergedThem | UnmergedUs))
+            return SubmitFileModel::FileUnmerged;
         if (state.testFlag(AddedFile) || state.testFlag(UntrackedFile))
             return SubmitFileModel::FileAdded;
         if (state.testFlag(ModifiedFile))