resolver.presentState(f, frBase, frSecond, frBase);
mediator.fastForwardB(frBase, frSecond, resolver);
} else if (fileRevBase == fileRevB) {
assert fileRevBase != null;
HgFileRevision frBase = new HgFileRevision(repo, fileRevBase, ma.flags(f), f);
HgFileRevision frFirst = new HgFileRevision(repo, fileRevA, m1.flags(f), f);
resolver.presentState(f, frFirst, frBase, frBase);
mediator.fastForwardA(frBase, frFirst, resolver);
} else {
HgFileRevision frBase = fileRevBase == null ? null : new HgFileRevision(repo, fileRevBase, ma.flags(f), f);
HgFileRevision frFirst = new HgFileRevision(repo, fileRevA, m1.flags(f), f);