rightFileRevision = org.openide.util.NbBundle.getMessage(ResolveConflictsExecutor.class, "Diff.titleWorkingFile"); // NOI18N
} else {
rightFileRevision = org.openide.util.NbBundle.getMessage(ResolveConflictsExecutor.class, "Diff.titleRevision", rightFileRevision); // NOI18N
}
final StreamSource s1;
final StreamSource s2;
Charset encoding = FileEncodingQuery.getEncoding(fo);
s1 = StreamSource.createSource(file.getName(), leftFileRevision, mimeType, f1);
s2 = StreamSource.createSource(file.getName(), rightFileRevision, mimeType, f2);
final StreamSource result = new MergeResultWriterInfo(f1, f2, f3, file, mimeType,
originalLeftFileRevision,
originalRightFileRevision,
fo, lock, encoding);
try {