| commit | 93c1a5742c1c89ddbdc5ad06011477d4f17ce80f | |
| author | Stefan Lay <stefan.lay@sap.com> | |
| Thu, 10 Oct 2013 13:14:54 +0000 (10 15:14 +0200) | ||
| committer | Robin Stocker <robin@nibor.org> | |
| Sat, 12 Oct 2013 11:57:38 +0000 (12 13:57 +0200) | ||
| tree | 48684b3c7b1b0678c71ce0d4185b79625446b5b1 | treesnapshot (tar.gz zip) |
| parent | c08ad4731c21fee393c6784f6cd237180429f484 | commitdiff |
Fix compare when file is not contained in common ancestor
When a version of a file was compared with another version in three-way
mode and the file was not contained in the common ancestor, the compare
editor did not show the differences but showed the whole files as
conflicting. The user had to switch to two-way compare in order to
see the diffs.
Now the compare editor is always opened in two-way compare mode if there
is no file contained in the common ancestor commit.
Bug: 419134
Change-Id: Ida7210b153880833a71abaf78840eedd69eec3d5
Signed-off-by: Robin Stocker <robin@nibor.org>
When a version of a file was compared with another version in three-way
mode and the file was not contained in the common ancestor, the compare
editor did not show the differences but showed the whole files as
conflicting. The user had to switch to two-way compare in order to
see the diffs.
Now the compare editor is always opened in two-way compare mode if there
is no file contained in the common ancestor commit.
Bug: 419134
Change-Id: Ida7210b153880833a71abaf78840eedd69eec3d5
Signed-off-by: Robin Stocker <robin@nibor.org>
| org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CompareUtils.java | diffblobblamehistory |