if (!lowLevelResult.containsConflicts()) return; if (conflicts == null)
File mergedFile = inCore ? null : writeMergedFile(rawMerged, attributes); if (result.containsConflicts()) {
if (result.containsConflicts() && !ignoreConflicts) { unmergedPaths.add(currentPath);
if (!lowLevelResult.containsConflicts()) return; if (conflicts == null)
if (!lowLevelResult.containsConflicts()) return; if (conflicts == null)
IOException { File mergedFile = !inCore ? writeMergedFile(result) : null; if (result.containsConflicts()) {
File mergedFile = inCore ? null : writeMergedFile(rawMerged, attributes); if (result.containsConflicts()) {
result.setContainsConflicts(false); updateIndex(base, ours, theirs, result); if (result.containsConflicts() && !ignoreConflicts) unmergedPaths.add(tw.getPathString()); modifiedFiles.add(tw.getPathString());
if (result.containsConflicts() && !ignoreConflicts) { unmergedPaths.add(currentPath);