979899100101102103104105106107
cache.refreshFileStatus(file, fi, interestingDirs.get(file.isDirectory() ? file : file.getParentFile())); } } } else { cache.refresh(root, StatusCache.REPOSITORY_STATUS_UNKNOWN); } } performAfter(); }
115116117118119120121122123124125
return; } StatusCache cache = Git.getInstance().getStatusCache(); deleteConflictFile(file.getAbsolutePath()); cache.refresh(file, StatusCache.REPOSITORY_STATUS_UNKNOWN); } public static void resolved(File file) { perform(file); }