From ea314d2f45c40a006c0104157013ab4b857f665f Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 15 Apr 2024 20:35:28 +0200
Subject: Adding upstream version 1.22.4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../t/dpkg_mergechangelogs/ch-unreleased-merged    | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 scripts/t/dpkg_mergechangelogs/ch-unreleased-merged

(limited to 'scripts/t/dpkg_mergechangelogs/ch-unreleased-merged')

diff --git a/scripts/t/dpkg_mergechangelogs/ch-unreleased-merged b/scripts/t/dpkg_mergechangelogs/ch-unreleased-merged
new file mode 100644
index 0000000..5fbf866
--- /dev/null
+++ b/scripts/t/dpkg_mergechangelogs/ch-unreleased-merged
@@ -0,0 +1,24 @@
+<<<<<<<
+test (1.2-0) UNRELEASED; urgency=low
+=======
+test (1.1-1) UNRELEASED; urgency=low
+>>>>>>>
+
+  * New upstream release.
+<<<<<<<
+    - Adds a new feature.
+=======
+    - Fixes a random bug.
+>>>>>>>
+
+<<<<<<<
+ -- Dpkg Developers <debian-dpkg@lists.debian.org>  Thu, 02 Sep 2021 05:26:30 +0200
+=======
+ -- Dpkg Developers <debian-dpkg@lists.debian.org>  Wed, 01 Sep 2021 05:27:48 +0200
+>>>>>>>
+
+test (1.0-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Dpkg Developers <debian-dpkg@lists.debian.org>  Wed, 20 Aug 1997 00:36:28 +0000
-- 
cgit v1.2.3