theirs.getEntryObjectId(), attributes); } catch (BinaryBlobException e) { MergeResult<RawText> r = new MergeResult<>(Collections.<RawText>emptyList()); r.setContainsConflicts(true); return r;
mergeResults.put( tw.getPathString(), new MergeResult<>(Collections .<RawText> emptyList())); MergeResult<SubmoduleConflict> result = new MergeResult<>( Arrays.asList( new SubmoduleConflict(base == null ? null
sequences.add(ours); sequences.add(theirs); MergeResult<S> result = new MergeResult<>(sequences);
theirs.getEntryObjectId(), attributes); } catch (BinaryBlobException e) { MergeResult<RawText> r = new MergeResult<>(Collections.<RawText>emptyList()); r.setContainsConflicts(true); return r;
mergeResults.put( tw.getPathString(), new MergeResult<RawText>(Collections .<RawText> emptyList()));
mergeResults.put( tw.getPathString(), new MergeResult<>(Collections .<RawText> emptyList())); MergeResult<SubmoduleConflict> result = new MergeResult<>( Arrays.asList( new SubmoduleConflict(base == null ? null
sequences.add(ours); sequences.add(theirs); MergeResult<S> result = new MergeResult<S>(sequences);
sequences.add(ours); sequences.add(theirs); MergeResult<S> result = new MergeResult<>(sequences);