diff options
Diffstat (limited to 'plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/ThreeWayWordMergeOperation.java')
| -rw-r--r-- | plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/ThreeWayWordMergeOperation.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/ThreeWayWordMergeOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/ThreeWayWordMergeOperation.java index 23d6786d9aa..54d1b30a93f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/ThreeWayWordMergeOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/ThreeWayWordMergeOperation.java @@ -78,7 +78,7 @@ public class ThreeWayWordMergeOperation extends AbstractOperation { Artifact startArtifact = MergeUtility.getStartArtifact(attributeConflict); monitor.worked(5); - List<IFile> outputFiles = new ArrayList<IFile>(); + List<IFile> outputFiles = new ArrayList<>(); createMergeDiffFile(outputFiles, startArtifact, attributeConflict.getSourceArtifact()); monitor.worked(15); |