Uploaded image for project: 'Qt Creator'
  1. Qt Creator
  2. QTCREATORBUG-10098

Wrong highlighting of three-way-diff

    XMLWordPrintable

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

      1. Create a three way diff in a git repository, e.g. by trying to merge with a conflict.
      2. In "Tools" -> "Options..." -> "Version Control" -> "Git", disable "Show diff side-by-side".
      3. 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

        1. 3diff.png
          68 kB
          Robert Löhning

        Issue Links

          No reviews matched the request. Check your Options in the drop-down menu of this sections header.

          Activity

            People

              jkobus Jarek Kobus
              rlohning Robert Löhning
              Votes:
              1 Vote for this issue
              Watchers:
              4 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved:

                Gerrit Reviews

                  There are no open Gerrit changes