-
Peter Kuemmel authored
'git diff' marks merge conflicts different to changes. With this fix it is possible to jump to the merge conflicts also by a double click. Task-number: QTCREATORBUG-6424 Change-Id: I355274e1ded4a05b3c7db718cbe9f48453070f82 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
26d0c729