| commit | db9c14c6313bda278c71c95153f75c2c386b768e | [log] [tgz] |
|---|---|---|
| author | Dani Megert <dmegert> | Tue Dec 04 10:17:52 2012 +0100 |
| committer | Dani Megert <dmegert> | Tue Dec 04 10:17:52 2012 +0100 |
| tree | 450c3dbe484607c4572d83c2a49d289b3d8b60da | |
| parent | de2f90f78e1dae810b50bdcb8ee913a0b8483e79 [diff] |
Ignore binary diffs
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 a18d93b..b625d21 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 @@ 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$ }