| <?xml version="1.0" encoding="UTF-8"?> |
| <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="git4idea.merge.GitMergeDialog"> |
| <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="6" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> |
| <margin top="0" left="0" bottom="0" right="0"/> |
| <constraints> |
| <xy x="20" y="20" width="500" height="215"/> |
| </constraints> |
| <properties/> |
| <border type="none"/> |
| <children> |
| <component id="9aca4" class="javax.swing.JLabel"> |
| <constraints> |
| <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/> |
| </constraints> |
| <properties> |
| <labelFor value="4d3f"/> |
| <text resource-bundle="git4idea/i18n/GitBundle" key="common.git.root"/> |
| </properties> |
| </component> |
| <component id="4d3f" class="javax.swing.JComboBox" binding="myGitRoot"> |
| <constraints> |
| <grid row="0" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/> |
| </constraints> |
| <properties> |
| <toolTipText resource-bundle="git4idea/i18n/GitBundle" key="common.git.root.tooltip"/> |
| </properties> |
| </component> |
| <component id="80a58" class="javax.swing.JLabel"> |
| <constraints> |
| <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false"/> |
| </constraints> |
| <properties> |
| <text resource-bundle="git4idea/i18n/GitBundle" key="merge.branches"/> |
| </properties> |
| </component> |
| <component id="a2ef5" class="javax.swing.JLabel"> |
| <constraints> |
| <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/> |
| </constraints> |
| <properties> |
| <text resource-bundle="git4idea/i18n/GitBundle" key="common.current.branch"/> |
| </properties> |
| </component> |
| <grid id="6ef52" layout-manager="GridLayoutManager" row-count="2" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> |
| <margin top="0" left="0" bottom="0" right="0"/> |
| <constraints> |
| <grid row="4" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/> |
| </constraints> |
| <properties/> |
| <border type="none"/> |
| <children> |
| <component id="86082" class="javax.swing.JCheckBox" binding="myNoCommitCheckBox" default-binding="true"> |
| <constraints> |
| <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/> |
| </constraints> |
| <properties> |
| <text resource-bundle="git4idea/i18n/GitBundle" key="merge.no.commit"/> |
| <toolTipText resource-bundle="git4idea/i18n/GitBundle" key="merge.no.commit.tooltip"/> |
| </properties> |
| </component> |
| <component id="bc48b" class="javax.swing.JCheckBox" binding="myNoFastForwardCheckBox" default-binding="true"> |
| <constraints> |
| <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/> |
| </constraints> |
| <properties> |
| <text resource-bundle="git4idea/i18n/GitBundle" key="merge.no.fast.forward"/> |
| <toolTipText resource-bundle="git4idea/i18n/GitBundle" key="merge.no.fast.forward.tooltip"/> |
| </properties> |
| </component> |
| <component id="de8fb" class="javax.swing.JCheckBox" binding="mySquashCommitCheckBox" default-binding="true"> |
| <constraints> |
| <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/> |
| </constraints> |
| <properties> |
| <text resource-bundle="git4idea/i18n/GitBundle" key="merge.squash.commit"/> |
| <toolTipText resource-bundle="git4idea/i18n/GitBundle" key="merge.squash.tooltip"/> |
| </properties> |
| </component> |
| <hspacer id="5babc"> |
| <constraints> |
| <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/> |
| </constraints> |
| </hspacer> |
| <component id="7e4d" class="javax.swing.JCheckBox" binding="myAddLogInformationCheckBox" default-binding="true"> |
| <constraints> |
| <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/> |
| </constraints> |
| <properties> |
| <text resource-bundle="git4idea/i18n/GitBundle" key="merge.add.log.information"/> |
| <toolTipText resource-bundle="git4idea/i18n/GitBundle" key="merge.add.log.information.tooltip"/> |
| </properties> |
| </component> |
| </children> |
| </grid> |
| <component id="1fcb7" class="javax.swing.JLabel" binding="myCurrentBranchText"> |
| <constraints> |
| <grid row="1" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/> |
| </constraints> |
| <properties> |
| <text value=""/> |
| <toolTipText resource-bundle="git4idea/i18n/GitBundle" key="common.current.branch.tooltip"/> |
| </properties> |
| </component> |
| <grid id="6a98a" binding="myBranchToMergeContainer" layout-manager="GridBagLayout"> |
| <constraints> |
| <grid row="2" column="1" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/> |
| </constraints> |
| <properties/> |
| <border type="none"/> |
| <children/> |
| </grid> |
| <component id="d4995" class="javax.swing.JLabel"> |
| <constraints> |
| <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false"/> |
| </constraints> |
| <properties> |
| <labelFor value="108e4"/> |
| <text resource-bundle="git4idea/i18n/GitBundle" key="merge.commit.message"/> |
| <verticalAlignment value="0"/> |
| </properties> |
| </component> |
| <component id="23b0f" class="javax.swing.JLabel"> |
| <constraints> |
| <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/> |
| </constraints> |
| <properties> |
| <labelFor value="3bcd7"/> |
| <text resource-bundle="git4idea/i18n/GitBundle" key="merge.strategy"/> |
| </properties> |
| </component> |
| <component id="108e4" class="javax.swing.JTextField" binding="myCommitMessage"> |
| <constraints> |
| <grid row="5" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false"> |
| <preferred-size width="150" height="-1"/> |
| </grid> |
| </constraints> |
| <properties> |
| <toolTipText resource-bundle="git4idea/i18n/GitBundle" key="merge.commit.message.tooltip"/> |
| </properties> |
| </component> |
| <component id="3bcd7" class="javax.swing.JComboBox" binding="myStrategy"> |
| <constraints> |
| <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/> |
| </constraints> |
| <properties> |
| <enabled value="false"/> |
| <model> |
| <item value="<default>"/> |
| </model> |
| <toolTipText resource-bundle="git4idea/i18n/GitBundle" key="merge.strategy.tooltip"/> |
| </properties> |
| </component> |
| <hspacer id="3b657"> |
| <constraints> |
| <grid row="3" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/> |
| </constraints> |
| </hspacer> |
| </children> |
| </grid> |
| </form> |
