Andre Hartmann 3a78b610d7 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>

2016-05-20 12:15:53 +00:00

..

qtcreator

VCS: Colorize unmerged files in submit editor

2016-05-20 12:15:53 +00:00

share.pro

use DISTFILES instead of OTHER_FILES in creator's own build system

2014-09-15 12:10:01 +02:00

share.qbs

Move 3rdparty resources into 3rdparty subdirectory

2016-04-12 12:30:55 +00:00