MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

annotation added

Browse Source
This commit is contained in:
Nadya Zabrodina
2014-10-03 19:49:35 +04:00
parent 69aa1fb7d1
commit dec5b5d740
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgConflictResolver.java
+1
View File
@@ -84,6 +84,7 @@ public final class HgConflictResolver {
}, ModalityState.defaultModalityState());
}
@NotNull
public static List<VirtualFile> findConflicts(final Project project, VirtualFile repo) {
Map<HgFile, HgResolveStatusEnum> resolves = new HgResolveCommand(project).getListSynchronously(repo);
final List<VirtualFile> conflicts = new ArrayList<VirtualFile>();