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

DiffEditor doesn't properly support merge commits

    XMLWordPrintable

Details

    • Bug
    • Resolution: Unresolved
    • P3: Somewhat important
    • None
    • Qt Creator 3.2.0-beta1
    • Version Control Integration

    Description

      It executes "git diff --unified=3 <sha>^ <sha>" instead of "git show <sha>"...

      As for itself, it can be useful too, but comparing all 3 parties of the merge is a must.

      Attachments

        Issue Links

          relates to

          Bug - A problem which impairs or prevents the functions of the product. QTCREATORBUG-10099 Incorrect display of three-way-diff

          • P2: Important - Urgent, should be fixed, but will not stop the release.
          • Closed
          For Gerrit Dashboard: QTCREATORBUG-12475
          # Subject Branch Project Status CR V
          356621,5 Prepare internal structures for 3 way diff master qt-creator/qt-creator Status: ABANDONED 0 0

          Activity

            People

              jkobus Jarek Kobus
              orgads Orgad Shaneh
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

                Created:
                Updated:

                Gerrit Reviews

                  There are no open Gerrit changes