List<AnAction> () { List<AnAction> group = new ArrayList<>(); group.add(new ApplySelectedChangesAction(Side.LEFT)); group.add(new ApplySelectedChangesAction(Side.RIGHT)); group.add(new ResolveSelectedChangesAction(Side.LEFT)); group.add(new ResolveSelectedChangesAction(Side.RIGHT)); group.add(new IgnoreSelectedChangesSideAction(Side.LEFT)); group.add(new IgnoreSelectedChangesSideAction(Side.RIGHT)); group.add(new ResolveSelectedConflictsAction()); group.add(new IgnoreSelectedChangesAction()); group.add(Separator.getInstance()); group.addAll(TextDiffViewerUtil.createEditorPopupActions()); return group; }