aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Thun2011-03-25 07:31:36 (EDT)
committerPhilipp Thun2011-03-25 07:31:36 (EDT)
commit7c973bddb37d43ca7c92b0c6987772531a35ed13 (patch)
tree0947ea328f8335a9fb0bad73278fb4ae1a5bb7b5
parent4f2b44e61ab86fec9062c6a4bd69104bf7b5b0f9 (diff)
downloadegit-7c973bddb37d43ca7c92b0c6987772531a35ed13.zip
egit-7c973bddb37d43ca7c92b0c6987772531a35ed13.tar.gz
egit-7c973bddb37d43ca7c92b0c6987772531a35ed13.tar.bz2
Handle FAILED rebase result in PullResultDialogrefs/changes/24/2924/1
Change-Id: I82f063dd8a85aa9970787408e8cc1be1ea95a33d Signed-off-by: Philipp Thun <philipp.thun@sap.com>
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullResultDialog.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullResultDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullResultDialog.java
index 5cf8018..d649eee 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullResultDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullResultDialog.java
@@ -108,6 +108,8 @@ public class PullResultDialog extends Dialog {
// fall through
case UP_TO_DATE:
// fall through
+ case FAILED:
+ // fall through
case ABORTED:
break;
case STOPPED: