Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMarkAsMergedHandler.java')
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMarkAsMergedHandler.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMarkAsMergedHandler.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMarkAsMergedHandler.java
index 5f1386a90..499292554 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMarkAsMergedHandler.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMarkAsMergedHandler.java
@@ -63,8 +63,7 @@ public class ResourceMarkAsMergedHandler extends ResourceMergeActionHandler {
private ISchedulingRule getMergeRule(IMergeContext context,
IDiff[] deltas) {
ISchedulingRule result = null;
- for (int i = 0; i < deltas.length; i++) {
- IDiff node = deltas[i];
+ for (IDiff node : deltas) {
ISchedulingRule rule = context.getMergeRule(node);
if (result == null) {
result = rule;

Back to the top