RepoUtils.modifyFileAppend(fileA, "A2");
fileB.delete();
new HgAddRemoveCommand(hgRepo).remove(fb).execute();
commitCmd.message("THIRD").execute();
// rev3: fork rev0, +file3, *file2
new HgCheckoutCommand(hgRepo).changeset(0).clean(true).execute();
final File fileC = new File(repoLoc, fc.toString());
RepoUtils.createFile(fileC, "third file");
RepoUtils.modifyFileAppend(fileB, "B2");
new HgAddRemoveCommand(hgRepo).add(fc).execute();
commitCmd.message("FOURTH").execute();
// rev4: *file3
RepoUtils.modifyFileAppend(fileC, "C1");
commitCmd.message("FIFTH").execute();
// rev5: merge rev2 with rev3
new HgCheckoutCommand(hgRepo).changeset(2).clean(true).execute();
new HgMergeCommand(hgRepo).changeset(3).execute(new HgMergeCommand.MediatorBase());
commitCmd.message("SIXTH: merge rev2 and rev3");
errorCollector.assertTrue(commitCmd.isMergeCommit());
HgMergeState ms = hgRepo.getMergeState();
ms.refresh();