Commit ceedde87 authored by Committed by Jarek KobusBrowse files
Try to show some meaningful diff when in merging state.
Instead of showing 3-way diff, show simple diff of conflicted file compared to the head of current branch. Task-number: QTCREATORBUG-10099 Change-Id: I9419236f0249fd2752f89ea80a2a644fb80af095 Reviewed-by: Orgad Shaneh <firstname.lastname@example.org>
Showing with 23 additions and 5 deletions