} catch (BinaryBlobException e) { MergeResult<RawText> r = new MergeResult<>(Collections.<RawText>emptyList()); r.setContainsConflicts(true); return r;
new SubmoduleConflict(theirs == null ? null : theirs.getEntryObjectId()))); result.setContainsConflicts(true); mergeResults.put(tw.getPathString(), result); if (!ignoreConflicts) { attributes); if (ignoreConflicts) { result.setContainsConflicts(false);
} catch (BinaryBlobException e) { MergeResult<RawText> r = new MergeResult<>(Collections.<RawText>emptyList()); r.setContainsConflicts(true); return r;
result.setContainsConflicts(false); updateIndex(base, ours, theirs, result); if (result.containsConflicts() && !ignoreConflicts)
new SubmoduleConflict(theirs == null ? null : theirs.getEntryObjectId()))); result.setContainsConflicts(true); mergeResults.put(tw.getPathString(), result); if (!ignoreConflicts) { attributes); if (ignoreConflicts) { result.setContainsConflicts(false);