# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /home/hmichel/projetos/netbeans/main
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: versioning.system.cvss/src/org/netbeans/modules/versioning/system/cvss/ui/actions/tag/MergePanel.form
--- versioning.system.cvss/src/org/netbeans/modules/versioning/system/cvss/ui/actions/tag/MergePanel.form Base (BASE)
+++ versioning.system.cvss/src/org/netbeans/modules/versioning/system/cvss/ui/actions/tag/MergePanel.form Locally Modified (Based On LOCAL)
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.1" encoding="UTF-8" ?>
 
-<Form version="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+<Form version="1.4" maxVersion="1.4" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <NonVisualComponents>
     <Component class="javax.swing.ButtonGroup" name="buttonGroup1">
     </Component>
@@ -8,6 +8,8 @@
     </Component>
   </NonVisualComponents>
   <AuxValues>
+    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
@@ -26,18 +28,13 @@
                       <EmptySpace min="17" pref="17" max="17" attributes="0"/>
                       <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
-                      <Component id="tfAfterMergeTagName" pref="289" max="32767" attributes="0"/>
+                      <Component id="tfAfterMergeTagName" pref="350" max="32767" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                       <Component id="browseAfterMergeTag" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                   </Group>
                   <Group type="102" alignment="0" attributes="0">
                       <Group type="103" groupAlignment="0" attributes="0">
-                          <Group type="102" alignment="0" attributes="0">
-                              <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
-                              <EmptySpace max="-2" attributes="0"/>
-                              <Component id="tfCurrentBranch" pref="178" max="32767" attributes="0"/>
-                          </Group>
                           <Component id="jLabel2" alignment="0" min="-2" max="-2" attributes="0"/>
                           <Group type="102" alignment="0" attributes="0">
                               <EmptySpace min="10" pref="10" max="10" attributes="0"/>
@@ -45,7 +42,7 @@
                                   <Group type="102" alignment="0" attributes="0">
                                       <Component id="rbFromTag" min="-2" max="-2" attributes="0"/>
                                       <EmptySpace max="-2" attributes="0"/>
-                                      <Component id="tfStartTag" pref="257" max="32767" attributes="0"/>
+                                      <Component id="tfStartTag" pref="319" max="32767" attributes="0"/>
                                   </Group>
                                   <Component id="rbFromBranchRoot" alignment="0" min="-2" max="-2" attributes="0"/>
                               </Group>
@@ -57,7 +54,7 @@
                   </Group>
                   <Group type="102" alignment="0" attributes="0">
                       <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace pref="434" max="32767" attributes="0"/>
+                      <EmptySpace pref="536" max="32767" attributes="0"/>
                   </Group>
                   <Group type="102" alignment="0" attributes="0">
                       <EmptySpace min="10" pref="10" max="10" attributes="0"/>
@@ -70,8 +67,8 @@
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="0" attributes="0">
-                                  <Component id="tfEndTag" alignment="1" pref="257" max="32767" attributes="0"/>
-                                  <Component id="tfBranch" alignment="1" pref="257" max="32767" attributes="0"/>
+                                  <Component id="tfEndTag" alignment="1" pref="319" max="32767" attributes="0"/>
+                                  <Component id="tfBranch" alignment="1" pref="319" max="32767" attributes="0"/>
                               </Group>
                               <EmptySpace max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="0" attributes="0">
@@ -84,21 +81,27 @@
                   </Group>
                   <Group type="102" alignment="0" attributes="0">
                       <Component id="cbTagAfterMerge" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace pref="290" max="32767" attributes="0"/>
+                      <EmptySpace pref="335" max="32767" attributes="0"/>
                   </Group>
+                  <Group type="102" attributes="0">
+                      <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace min="-2" max="-2" attributes="0"/>
+                      <Component id="tfCurrentBranch" pref="286" max="32767" attributes="0"/>
+                      <EmptySpace min="-2" max="-2" attributes="0"/>
               </Group>
           </Group>
       </Group>
+      </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="0" attributes="0">
-              <EmptySpace max="-2" attributes="0"/>
+              <EmptySpace min="-2" max="-2" attributes="0"/>
               <Group type="103" groupAlignment="3" attributes="0">
                   <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="tfCurrentBranch" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace max="-2" attributes="0"/>
+              <EmptySpace min="-2" max="-2" attributes="0"/>
               <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Component id="rbFromBranchRoot" min="-2" max="-2" attributes="0"/>
Index: versioning.system.cvss/src/org/netbeans/modules/versioning/system/cvss/ui/actions/tag/MergePanel.java
--- versioning.system.cvss/src/org/netbeans/modules/versioning/system/cvss/ui/actions/tag/MergePanel.java Base (BASE)
+++ versioning.system.cvss/src/org/netbeans/modules/versioning/system/cvss/ui/actions/tag/MergePanel.java Locally Modified (Based On LOCAL)
@@ -236,7 +236,7 @@
      * WARNING: Do NOT modify this code. The content of this method is
      * always regenerated by the Form Editor.
      */
-    // <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents
+   // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
 
         buttonGroup1 = new javax.swing.ButtonGroup();
@@ -378,16 +378,12 @@
                         .add(17, 17, 17)
                         .add(jLabel4)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(tfAfterMergeTagName, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 289, Short.MAX_VALUE)
+                  .add(tfAfterMergeTagName, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 350, Short.MAX_VALUE)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                         .add(browseAfterMergeTag)
                         .addContainerGap())
                     .add(layout.createSequentialGroup()
                         .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                            .add(layout.createSequentialGroup()
-                                .add(jLabel1)
-                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                                .add(tfCurrentBranch, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 178, Short.MAX_VALUE))
                             .add(jLabel2)
                             .add(layout.createSequentialGroup()
                                 .add(10, 10, 10)
@@ -395,14 +391,14 @@
                                     .add(layout.createSequentialGroup()
                                         .add(rbFromTag)
                                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                                        .add(tfStartTag, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 257, Short.MAX_VALUE))
+                              .add(tfStartTag, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 319, Short.MAX_VALUE))
                                     .add(rbFromBranchRoot))))
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                         .add(browseStartTag)
                         .addContainerGap())
                     .add(layout.createSequentialGroup()
                         .add(jLabel3)
-                        .addContainerGap(434, Short.MAX_VALUE))
+                  .addContainerGap(536, Short.MAX_VALUE))
                     .add(layout.createSequentialGroup()
                         .add(10, 10, 10)
                         .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
@@ -413,8 +409,8 @@
                                     .add(rbToBranchHead))
                                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                                 .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                                    .add(org.jdesktop.layout.GroupLayout.TRAILING, tfEndTag, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 257, Short.MAX_VALUE)
-                                    .add(org.jdesktop.layout.GroupLayout.TRAILING, tfBranch, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 257, Short.MAX_VALUE))
+                           .add(org.jdesktop.layout.GroupLayout.TRAILING, tfEndTag, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 319, Short.MAX_VALUE)
+                           .add(org.jdesktop.layout.GroupLayout.TRAILING, tfBranch, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 319, Short.MAX_VALUE))
                                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                                 .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                                     .add(browseBranch)
@@ -422,7 +418,12 @@
                                 .addContainerGap())))
                     .add(layout.createSequentialGroup()
                         .add(cbTagAfterMerge)
-                        .addContainerGap(290, Short.MAX_VALUE))))
+                  .addContainerGap(335, Short.MAX_VALUE))
+               .add(layout.createSequentialGroup()
+                  .add(jLabel1)
+                  .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                  .add(tfCurrentBranch, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 286, Short.MAX_VALUE)
+                  .addContainerGap())))
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)