dpkg-mergechangelogs: fix test-suite

In commit 5c233019cc770fb59671090d4a9462adb149921f I forgot to
update the test-suite to match for the change of conflict markers.
Doing this with this commit.

scripts/t/910_merge_changelogs/ch-merged

@@ -47,20 +47,20 @@ test (1.2-1) unstable; urgency=low
 test (1.1-1+conflict2) unstable; urgency=low
 
   * This entry has a conflict on the next line.
-<<<<<<
+<<<<<<<
   * I'm in changelog A.
-======
+=======
   * I'm in changelog B.
->>>>>>
+>>>>>>>
   * This line is the same in all 3 versions.
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:07:40 +0200
 
-<<<<<<
+<<<<<<<
 test (1.1-1+conflict1) experimental; urgency=low
-======
+=======
 test (1.1-1+conflict1) unstable; urgency=high
->>>>>>
+>>>>>>>
 
   * This entry has conflicts on the header line: A wants distribution
     experimental (instead of unstable) and B wants urgency=high (instead
@@ -68,11 +68,11 @@ test (1.1-1+conflict1) unstable; urgency=high
   * But it also has a conflict on the trailer line. A changed the
     timestamp to 18:05:00 and B to 18:06:00.
 
-<<<<<<
+<<<<<<<
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:05:00 +0200
-======
+=======
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:06:00 +0200
->>>>>>
+>>>>>>>
 
 test (1.1-1+change2) unstable; urgency=low
 

scripts/t/910_merge_changelogs/ch-merged-basic

@@ -30,7 +30,7 @@ test (1.2-2) unstable; urgency=low
 
 test (1.2-1) unstable; urgency=low
 
-<<<<<<
+<<<<<<<
   * This entry should not have conflicts with Algorithm::Merge installed.
   * Changelog B should a have supplementary line above this one.
   * Pi is 3.14 is true for all changelogs.
@@ -43,7 +43,7 @@ test (1.2-1) unstable; urgency=low
   * This line should be shared but the next one is dropped in B only.
   * If I'm here it's because the changelog is not B (I should not appear
     in the resulting changelog).
-======
+=======
   * This entry should not have conflicts with Algorithm::Merge installed.
   * I'm the added line mentionned below (B-only).
   * Changelog B should a have supplementary line above this one.
@@ -54,29 +54,29 @@ test (1.2-1) unstable; urgency=low
     - Yet I'm hacking on dpkg
     - What does that mean about me?
   * This line should be shared but the next one is dropped in B only.
->>>>>>
+>>>>>>>
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:09:07 +0200
 
 test (1.1-1+conflict2) unstable; urgency=low
 
-<<<<<<
+<<<<<<<
   * This entry has a conflict on the next line.
   * I'm in changelog A.
   * This line is the same in all 3 versions.
-======
+=======
   * This entry has a conflict on the next line.
   * I'm in changelog B.
   * This line is the same in all 3 versions.
->>>>>>
+>>>>>>>
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:07:40 +0200
 
-<<<<<<
+<<<<<<<
 test (1.1-1+conflict1) experimental; urgency=low
-======
+=======
 test (1.1-1+conflict1) unstable; urgency=high
->>>>>>
+>>>>>>>
 
   * This entry has conflicts on the header line: A wants distribution
     experimental (instead of unstable) and B wants urgency=high (instead
@@ -84,11 +84,11 @@ test (1.1-1+conflict1) unstable; urgency=high
   * But it also has a conflict on the trailer line. A changed the
     timestamp to 18:05:00 and B to 18:06:00.
 
-<<<<<<
+<<<<<<<
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:05:00 +0200
-======
+=======
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:06:00 +0200
->>>>>>
+>>>>>>>
 
 test (1.1-1+change2) unstable; urgency=low
 
@@ -101,17 +101,17 @@ test (1.1-1+change2) unstable; urgency=low
 
 test (1.1-1+change1) unstable; urgency=high
 
-<<<<<<
+<<<<<<<
   * This entry is everywhere but the last line is different in B. The
     merged version should have what's in B. Furthermore the urgency in
     A is set to high, it should also be picked up.
   * I'm not in changelog B.
-======
+=======
   * This entry is everywhere but the last line is different in B. The
     merged version should have what's in B. Furthermore the urgency in
     A is set to high, it should also be picked up.
   * I'm definitely in changelog B.
->>>>>>
+>>>>>>>
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 17:50:58 +0200
 

scripts/t/910_merge_changelogs/ch-merged-pr

@@ -1,8 +1,8 @@
-<<<<<<
+<<<<<<<
 test (2.0-1) unstable; urgency=low
-======
+=======
 test (2.0-1~exp3) unstable; urgency=low
->>>>>>
+>>>>>>>
 
   * Version B with 2.0-1~exp3 contains only up to line 3 while version A
     with 2.0-1 contains the 5 lines. The resulting version should have the
@@ -40,20 +40,20 @@ test (1.2-1) unstable; urgency=low
 test (1.1-1+conflict2) unstable; urgency=low
 
   * This entry has a conflict on the next line.
-<<<<<<
+<<<<<<<
   * I'm in changelog A.
-======
+=======
   * I'm in changelog B.
->>>>>>
+>>>>>>>
   * This line is the same in all 3 versions.
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:07:40 +0200
 
-<<<<<<
+<<<<<<<
 test (1.1-1+conflict1) experimental; urgency=low
-======
+=======
 test (1.1-1+conflict1) unstable; urgency=high
->>>>>>
+>>>>>>>
 
   * This entry has conflicts on the header line: A wants distribution
     experimental (instead of unstable) and B wants urgency=high (instead
@@ -61,11 +61,11 @@ test (1.1-1+conflict1) unstable; urgency=high
   * But it also has a conflict on the trailer line. A changed the
     timestamp to 18:05:00 and B to 18:06:00.
 
-<<<<<<
+<<<<<<<
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:05:00 +0200
-======
+=======
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:06:00 +0200
->>>>>>
+>>>>>>>
 
 test (1.1-1+change2) unstable; urgency=low
 

scripts/t/910_merge_changelogs/ch-merged-pr-basic

@@ -1,10 +1,10 @@
-<<<<<<
+<<<<<<<
 test (2.0-1) unstable; urgency=low
-======
+=======
 test (2.0-1~exp3) unstable; urgency=low
->>>>>>
+>>>>>>>
 
-<<<<<<
+<<<<<<<
   * Version B with 2.0-1~exp3 contains only up to line 3 while version A
     with 2.0-1 contains the 5 lines. The resulting version should have the
     5 lines without conflict with Algorithm::Merge and a conflict without.
@@ -13,14 +13,14 @@ test (2.0-1~exp3) unstable; urgency=low
   * Line 3.
   * Line 4.
   * Line 5.
-======
+=======
   * Version B with 2.0-1~exp3 contains only up to line 3 while version A
     with 2.0-1 contains the 5 lines. The resulting version should have the
     5 lines without conflict with Algorithm::Merge and a conflict without.
   * Line 1.
   * Line 2.
   * Line 3.
->>>>>>
+>>>>>>>
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:23:09 +0200
 
@@ -32,7 +32,7 @@ test (1.2-2) unstable; urgency=low
 
 test (1.2-1) unstable; urgency=low
 
-<<<<<<
+<<<<<<<
   * This entry should not have conflicts with Algorithm::Merge installed.
   * Changelog B should a have supplementary line above this one.
   * Pi is 3.14 is true for all changelogs.
@@ -45,7 +45,7 @@ test (1.2-1) unstable; urgency=low
   * This line should be shared but the next one is dropped in B only.
   * If I'm here it's because the changelog is not B (I should not appear
     in the resulting changelog).
-======
+=======
   * This entry should not have conflicts with Algorithm::Merge installed.
   * I'm the added line mentionned below (B-only).
   * Changelog B should a have supplementary line above this one.
@@ -56,29 +56,29 @@ test (1.2-1) unstable; urgency=low
     - Yet I'm hacking on dpkg
     - What does that mean about me?
   * This line should be shared but the next one is dropped in B only.
->>>>>>
+>>>>>>>
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:09:07 +0200
 
 test (1.1-1+conflict2) unstable; urgency=low
 
-<<<<<<
+<<<<<<<
   * This entry has a conflict on the next line.
   * I'm in changelog A.
   * This line is the same in all 3 versions.
-======
+=======
   * This entry has a conflict on the next line.
   * I'm in changelog B.
   * This line is the same in all 3 versions.
->>>>>>
+>>>>>>>
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:07:40 +0200
 
-<<<<<<
+<<<<<<<
 test (1.1-1+conflict1) experimental; urgency=low
-======
+=======
 test (1.1-1+conflict1) unstable; urgency=high
->>>>>>
+>>>>>>>
 
   * This entry has conflicts on the header line: A wants distribution
     experimental (instead of unstable) and B wants urgency=high (instead
@@ -86,11 +86,11 @@ test (1.1-1+conflict1) unstable; urgency=high
   * But it also has a conflict on the trailer line. A changed the
     timestamp to 18:05:00 and B to 18:06:00.
 
-<<<<<<
+<<<<<<<
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:05:00 +0200
-======
+=======
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 18:06:00 +0200
->>>>>>
+>>>>>>>
 
 test (1.1-1+change2) unstable; urgency=low
 
@@ -103,17 +103,17 @@ test (1.1-1+change2) unstable; urgency=low
 
 test (1.1-1+change1) unstable; urgency=high
 
-<<<<<<
+<<<<<<<
   * This entry is everywhere but the last line is different in B. The
     merged version should have what's in B. Furthermore the urgency in
     A is set to high, it should also be picked up.
   * I'm not in changelog B.
-======
+=======
   * This entry is everywhere but the last line is different in B. The
     merged version should have what's in B. Furthermore the urgency in
     A is set to high, it should also be picked up.
   * I'm definitely in changelog B.
->>>>>>
+>>>>>>>
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 17:50:58 +0200