diff options
| author | Peter Kuemmel <syntheticpp@gmx.net> | 2011-10-30 11:31:51 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2011-11-02 10:12:51 +0100 |
| commit | 26d0c7290f2cabd0799e683f23842c4e789f0f94 (patch) | |
| tree | cd24a54ff6650032fa7f4f8d9b43dcb0ff57dd07 /src/plugins/texteditor/snippets/snippeteditor.cpp | |
| parent | 3c350c93d8f22c767191ea4a1eb0397f8649db4b (diff) | |
| download | qt-creator-26d0c7290f2cabd0799e683f23842c4e789f0f94.tar.gz | |
VCS base diff editor with merge conflicts
'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>
Diffstat (limited to 'src/plugins/texteditor/snippets/snippeteditor.cpp')
0 files changed, 0 insertions, 0 deletions