Files
qt-creator/src/plugins/git
jkobus ceedde8769 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 <orgads@gmail.com>
2014-08-13 16:53:24 +02:00
..
2013-12-06 12:12:56 +01:00
2013-04-08 11:25:46 +02:00
2013-02-26 12:54:40 +01:00
2014-03-13 12:06:27 +01:00
2014-03-11 14:20:22 +01:00
2013-12-06 12:12:56 +01:00
2014-08-13 16:45:52 +02:00
2014-06-24 11:20:59 +02:00
2014-01-08 08:29:47 +01:00
2014-01-08 08:29:47 +01:00
2011-05-13 14:56:31 +02:00
2013-02-27 15:27:27 +01:00