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

DiffEditor doesn't properly support merge commits

XMLWordPrintable

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

      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.

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

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

              Created:
              Updated:

                There are no open Gerrit changes