| commit | 7ffb222124380f8205df316ac145ca6e05d1cd1c | |
| author | Robin Stocker <robin@nibor.org> | |
| Sat, 20 Oct 2012 22:10:24 +0000 (21 00:10 +0200) | ||
| committer | Matthias Sohn <matthias.sohn@sap.com> | |
| Thu, 3 Jan 2013 22:59:33 +0000 (3 23:59 +0100) | ||
| tree | 701ef84bb6fa2d05661c98c2e75835403b3ca706 | treesnapshot (tar.gz zip) |
| parent | 8e090bd28feb1348ec4ed077f46528470fb0cd40 | commitdiff |
Also enable Merge Tool for conflicts caused by stash
Check index diff for conflicting files contained in the selection
instead of repository state. This should be more reliable.
This depends on the previous change for the ResourceUtil changes.
Bug: 376135
Change-Id: I9e14c491254ea1927c4b57989e8282d657945685
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Check index diff for conflicting files contained in the selection
instead of repository state. This should be more reliable.
This depends on the previous change for the ResourceUtil changes.
Bug: 376135
Change-Id: I9e14c491254ea1927c4b57989e8282d657945685
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/MergeToolActionHandler.java | diffblobblamehistory |