modify merge tests to test merging blocking bugs

diff --git a/t/12_merge.t b/t/12_merge.t
index e420ae3ac84af39f1dd2d77ba870a7fd3dffe80c..a20b3979364b9d16a4fdcd5c3d35eb9fbd74dbb5 100644 (file)
--- a/t/12_merge.t
+++ b/t/12_merge.t
@@ -164,14 +164,16 @@ EOF
 
 test_control_commands(\%config,
                      forcemerge   => {command => 'forcemerge',
-                                      value   => '1 2',
+                                      value   => "2 3\nseverity 2 minor",
                                       status_key => 'mergedwith',
-                                      status_value => '2',
+                                      status_value => '3',
+                                      bug => 2,
                                      },
                      unmerge      => {command => 'unmerge',
-                                      value   => '1',
+                                      value   => '2',
                                       status_key => 'mergedwith',
                                       status_value => '',
+                                      bug => 2,
                                      },
                      forcemerge   => {command => 'forcemerge',
                                       value   => '1 2 5',