diff options
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java index 2099352f5f..045fecd219 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java @@ -169,8 +169,9 @@ public class MergeResult { this.mergeStrategy = mergeStrategy; this.description = description; if (lowLevelResults != null) - for (String path : lowLevelResults.keySet()) - addConflict(path, lowLevelResults.get(path)); + for (Map.Entry<String, org.eclipse.jgit.merge.MergeResult<?>> result : lowLevelResults + .entrySet()) + addConflict(result.getKey(), result.getValue()); } /** |