resolver.presentState(f, frFirst, frSecond, frBase);
mediator.resolve(frBase, frFirst, frSecond, resolver);
}
} else {
// m2 doesn't contain the file, either new in m1, or deleted in m2
HgFileRevision frFirst = new HgFileRevision(repo, m1.nodeid(f), m1.flags(f), f);
if (ma.contains(f)) {
// deleted in m2
HgFileRevision frBase = new HgFileRevision(repo, ma.nodeid(f), ma.flags(f), f);
resolver.presentState(f, frFirst, null, frBase);
mediator.onlyA(frBase, frFirst, resolver);