Changeset base = commit();
writeFile("a", "");
setExecutable(repo.file("a"));
Changeset parent2 = commit();
update(base);
createSymlink(repo.file("b"), repo.file("a"));
commit();
ConflictResolvingContext mergeCtx = repo.workingCopy().merge(parent2);
//Assert.assertEquals(1, mergeCtx.getFlagConflicts().size());
//Assert.assertEquals("a", mergeCtx.getFlagConflicts().iterator().next().getFilename());