// XXX if presentState(null, fileOnlyInB), and use(InputStream) - i.e.
// resolution is to add file with supplied content - shall I put 'Merged', MergedFromP2 or 'Added' into dirstate?
if (revA == null && revB != null) {
dirstateBuilder.recordMergedFromP2(file);
} else {
dirstateBuilder.recordMerged(file, fw.fmode(), fw.mtime(), fw.bytesWritten());
}
} // else no resolution was chosen, fine with that
}
public void use(HgFileRevision rev) {