-
jkobus authored
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 <orgads@gmail.com>
ceedde87