diff options
author | Dani Megert | 2012-12-04 09:17:52 +0000 |
---|---|---|
committer | Dani Megert | 2012-12-04 09:17:52 +0000 |
commit | db9c14c6313bda278c71c95153f75c2c386b768e (patch) | |
tree | 450c3dbe484607c4572d83c2a49d289b3d8b60da | |
parent | de2f90f78e1dae810b50bdcb8ee913a0b8483e79 (diff) | |
download | eclipse.platform.team-db9c14c6313bda278c71c95153f75c2c386b768e.tar.gz eclipse.platform.team-db9c14c6313bda278c71c95153f75c2c386b768e.tar.xz eclipse.platform.team-db9c14c6313bda278c71c95153f75c2c386b768e.zip |
Ignore binary diffsv20121204-091752I20121209-2000I20121204-2230I20121204-1600I20121204-1000I20121204-0915I20121204-0800
-rw-r--r-- | bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java | 4 |
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$ } |