Assert.assertEquals(KeepDeleteConflict.State.KEEP, keepDeleteConflict.getState());
Assert.assertEquals("a", keepDeleteConflict.getFilename());
Assert.assertEquals(p2, keepDeleteConflict.getKeepParent());
update(p2);
ms = repo.workingCopy().merge(p1);
Assert.assertEquals(1, ms.getKeepDeleteConflicts().size());
keepDeleteConflict = ms.getKeepDeleteConflicts().iterator().next();
Assert.assertEquals(KeepDeleteConflict.State.KEEP, keepDeleteConflict.getState());
Assert.assertEquals("a", keepDeleteConflict.getFilename());
Assert.assertEquals(p2, keepDeleteConflict.getKeepParent());