helper = new ResolveConflictHelper(mockProject, mockUpdatedFiles, updateRoots);
}
@Test
public void testMerge_Rename_TakeTheirs() throws Exception {
renameTest(((RenameConflict) CONFLICT_RENAME).getServerPath());
<BUG>verify(helper).resolveConflictWithProgress(CONFLICT_RENAME.getLocalPath(), ((RenameConflict) CONFLICT_RENAME).getServerPath(), ResolveConflictsCommand.AutoResolveType.TakeTheirs, mockServerContext, mockResolveConflictsModel, true);
</BUG>
}
@Test
public void testMerge_Rename_KeepYours() throws Exception {

helper = new ResolveConflictHelper(mockProject, mockUpdatedFiles, updateRoots);
}
@Test
public void testMerge_Rename_TakeTheirs() throws Exception {
renameTest(((RenameConflict) CONFLICT_RENAME).getServerPath());
verify(helper).resolveConflictWithProgress(Matchers.eq(CONFLICT_RENAME.getLocalPath()), Matchers.eq(((RenameConflict) CONFLICT_RENAME).getServerPath()), Matchers.eq(ResolveConflictsCommand.AutoResolveType.TakeTheirs), Matchers.eq(mockServerContext), Matchers.eq(mockResolveConflictsModel), Matchers.eq(true), any(NameMergerResolution.class));
}
@Test
public void testMerge_Rename_KeepYours() throws Exception {
