void (TreeConflictDescription description, JPanel main, GridBagConstraints gb) { JPanel wrapper = new JPanel(new FlowLayout(FlowLayout.LEFT, 5, 5)); final JButton merge = new JButton(message("button.resolve.conflict.merge")); final JButton left = new JButton(message("button.resolve.conflict.accept.yours")); final JButton right = new JButton(message("button.resolve.conflict.accept.theirs")); enableAndSetListener(createMerge(description), merge); enableAndSetListener(createLeft(description), left); enableAndSetListener(createRight(description), right); if (merge.isEnabled()) { wrapper.add(merge); } wrapper.add(left); wrapper.add(right); gb.insets.left = -4; main.add(wrapper, gb); gb.insets.left = 1; ++gb.gridy; }