forked from qt-creator/qt-creator
Tools > Git > Git Tools > Merge Tool is visible only when the user has a merge conflict to resolve. Change-Id: I1c08dae329152726139d075b03a98875b789e154 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Tools > Git > Git Tools > Merge Tool is visible only when the user has a merge conflict to resolve. Change-Id: I1c08dae329152726139d075b03a98875b789e154 Reviewed-by: Orgad Shaneh <orgads@gmail.com>