diff options
Diffstat (limited to 'bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java')
-rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java index f9a0d9b7f..f002e1212 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java @@ -53,8 +53,7 @@ public class TextStreamMerger implements IStreamMerger { RangeDifference[] diffs= RangeDifferencer.findRanges(monitor, a, t, o); - for (int i= 0; i < diffs.length; i++) { - RangeDifference rd= diffs[i]; + for (RangeDifference rd : diffs) { switch (rd.kind()) { case RangeDifference.ANCESTOR: // pseudo conflict case RangeDifference.NOCHANGE: |