summaryrefslogtreecommitdiff
path: root/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateDialog.form
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateDialog.form')
-rw-r--r--plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateDialog.form59
1 files changed, 0 insertions, 59 deletions
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateDialog.form b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateDialog.form
deleted file mode 100644
index 34b0d83022ba..000000000000
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateDialog.form
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.zmlx.hg4idea.ui.HgUpdateDialog">
- <grid id="27dc6" binding="contentPane" layout-manager="GridLayoutManager" row-count="5" column-count="2" 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="400"/>
- </constraints>
- <properties/>
- <border type="none"/>
- <children>
- <component id="6a810" class="javax.swing.JCheckBox" binding="pullCheckBox" 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 value="&amp;pull"/>
- <toolTipText value="pull from the default remote repository"/>
- </properties>
- </component>
- <hspacer id="732d8">
- <constraints>
- <grid row="0" column="1" 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="2555e" class="javax.swing.JCheckBox" binding="updateCheckBox" 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 value="&amp;update"/>
- <toolTipText value="update to the head of the current branch"/>
- </properties>
- </component>
- <component id="3a607" class="javax.swing.JCheckBox" binding="mergeCheckBox" default-binding="true">
- <constraints>
- <grid row="2" 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 value="&amp;merge"/>
- <toolTipText value="merge if pulling resulted in extra heads"/>
- </properties>
- </component>
- <component id="6499c" class="javax.swing.JCheckBox" binding="commitAfterMergeCheckBox" default-binding="true">
- <constraints>
- <grid row="3" 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 value="&amp;commit after merge without conflicts"/>
- <toolTipText value="commit automatically after the merge"/>
- </properties>
- </component>
- <vspacer id="26be6">
- <constraints>
- <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
- </constraints>
- </vspacer>
- </children>
- </grid>
-</form>