Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2012-12-04 09:17:52 +0000
committerDani Megert2012-12-04 09:17:52 +0000
commitdb9c14c6313bda278c71c95153f75c2c386b768e (patch)
tree450c3dbe484607c4572d83c2a49d289b3d8b60da
parentde2f90f78e1dae810b50bdcb8ee913a0b8483e79 (diff)
downloadeclipse.platform.team-db9c14c6313bda278c71c95153f75c2c386b768e.tar.gz
eclipse.platform.team-db9c14c6313bda278c71c95153f75c2c386b768e.tar.xz
eclipse.platform.team-db9c14c6313bda278c71c95153f75c2c386b768e.zip
-rw-r--r--bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java
index a18d93ba6..b625d21bb 100644
--- a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java
+++ b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java
@@ -333,6 +333,10 @@ public class PatchReader {
if (line.indexOf("diff ") == 0) //$NON-NLS-1$
break;
//$FALL-THROUGH$
+ case 'B':
+ if (line.indexOf("Binary files differ") == 0) //$NON-NLS-1$
+ break;
+ //$FALL-THROUGH$
default:
throw new IOException("Invalid patch"); //$NON-NLS-1$
}

Back to the top