mergeResult = callback.fileChanged(name, f1, f2, rev1[0], rev2[0], mimeType1, mimeType2, props1, propsDiff); } finally { SVNFileUtil.deleteAll(f1, null);
} else { myIsAddNecessitatedMerge = true; result = fileChanged(path, file1, file2, revision1, revision2, mimeType1, mimeType2, originalProperties, diff); myIsAddNecessitatedMerge = false;