| commit | 975dfb4445e3406d15be5d3707679a60a80274b5 | |
| author | Matthias Sohn <matthias.sohn@sap.com> | |
| Fri, 9 Jan 2015 00:48:00 +0000 (9 01:48 +0100) | ||
| committer | Christian Halstrick <christian.halstrick@sap.com> | |
| Mon, 2 Feb 2015 13:50:16 +0000 (2 14:50 +0100) | ||
| tree | b0830d4b5dc8e84656393d04b0d254bc588c0453 | treesnapshot (tar.gz zip) |
| parent | d4bfe4884159ee21243ea015144bcea80a47dc79 | commitdiff |
Open mergetool by default in staging view when in conflicting state
Bug: 457055
Change-Id: I8299a9fff62147923d2300a1b4303ff5cb5a1c5e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Bug: 457055
Change-Id: I8299a9fff62147923d2300a1b4303ff5cb5a1c5e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java | diffblobblamehistory |