-
Andre Hartmann authored
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>
3a78b610