update(base);
writeFile("a", "YY");
writeFile("b", "a\na\na\nY\na\n");
commit();
ConflictResolvingContext mergeState = repo.workingCopy().merge(parent2);
List<MergeConflict> mergeConflicts = mergeState.getMergeConflicts();
Assert.assertEquals(2, mergeConflicts.size());
MergeConflict mca = mergeConflicts.get(0);
MergeConflict mcb = mergeConflicts.get(1);
Assert.assertEquals("a", mca.getFilename());