summaryrefslogtreecommitdiffstats
path: root/scripts/t/merge_changelogs/ch-unreleased-merged
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--scripts/t/merge_changelogs/ch-unreleased-merged24
-rw-r--r--scripts/t/merge_changelogs/ch-unreleased-merged-basic25
2 files changed, 49 insertions, 0 deletions
diff --git a/scripts/t/merge_changelogs/ch-unreleased-merged b/scripts/t/merge_changelogs/ch-unreleased-merged
new file mode 100644
index 0000000..5fbf866
--- /dev/null
+++ b/scripts/t/merge_changelogs/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
diff --git a/scripts/t/merge_changelogs/ch-unreleased-merged-basic b/scripts/t/merge_changelogs/ch-unreleased-merged-basic
new file mode 100644
index 0000000..dd6938c
--- /dev/null
+++ b/scripts/t/merge_changelogs/ch-unreleased-merged-basic
@@ -0,0 +1,25 @@
+<<<<<<<
+test (1.2-0) UNRELEASED; urgency=low
+=======
+test (1.1-1) UNRELEASED; urgency=low
+>>>>>>>
+
+<<<<<<<
+ * New upstream release.
+ - Adds a new feature.
+=======
+ * New upstream release.
+ - 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