Assert.assertNotNull(mergeConflict);
// Mercurial 2.2 will skip empty commits, so we must resolve
// with new content.
writeFile("file", "XY");
mergeConflict.markResolved();
Changeset cs = ctx.commit();
Assert.assertNotNull(cs);
Assert.assertEquals(changed1.getNode(), cs.getExtra().getString("source"));
}
}