| commit | f74334b84a4ee1cfb9fafb602e6cc52e04c29838 | |
| author | Robin Stocker <robin@nibor.org> | |
| Sun, 13 Oct 2013 13:32:57 +0000 (13 15:32 +0200) | ||
| committer | Matthias Sohn <matthias.sohn@sap.com> | |
| Wed, 16 Oct 2013 22:01:19 +0000 (17 00:01 +0200) | ||
| tree | a6e9790149f015a60d85c40166f5917994bc262f | treesnapshot (tar.gz zip) |
| parent | 867da6a3d8ebe5dc535732161a835b71aef26cc8 | commitdiff |
[stagingView] Fix refresh action being disabled during conflicts
In I54ebec9cbfb89b994e857cd8a20b2be6a55c65fb, the call to
enableCommitWidgets was changed to also disable them in case of
conflicts. This is fine for the commit related buttons, but refresh
should not be disabled then.
Change-Id: I9633fb36c1a178570fbdf53ef78649e99cf44d0e
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
In I54ebec9cbfb89b994e857cd8a20b2be6a55c65fb, the call to
enableCommitWidgets was changed to also disable them in case of
conflicts. This is fine for the commit related buttons, but refresh
should not be disabled then.
Change-Id: I9633fb36c1a178570fbdf53ef78649e99cf44d0e
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java | diffblobblamehistory |