Details
-
Bug
-
Resolution: Out of scope
-
P2: Important
-
None
-
Qt Creator 2.8.1, Qt Creator 3.0.0-rc1
-
None
-
Windows 7 64 bit
git version 1.8.1.msysgit.1
Description
- Create a three way diff in a git repository, e.g. by trying to merge with a conflict.
- In "Tools" -> "Options..." -> "Version Control" -> "Git", disable "Show diff side-by-side".
- Make Creator show this diff.
It will show the diff with a broken highlighting:
Instead, Creator should show only unchanged lines in normal text color, whereas the changed lines should be highlighted in a different, or even two different colors.
Attachments
Issue Links
- is replaced by
-
QTCREATORBUG-10099 Incorrect display of three-way-diff
- Closed