diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 14:58:51 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 14:58:51 +0000 |
| commit | cbffab246997fb5a06211dfb706b54e5ae5bb59f (patch) | |
| tree | 0573c5d96f58d74d76a49c0f2a70398e389a36d3 /scripts/t/merge_changelogs/ch-unreleased-merged | |
| parent | Initial commit. (diff) | |
| download | dpkg-upstream.tar.xz dpkg-upstream.zip | |
Adding upstream version 1.21.22.upstream/1.21.22upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | scripts/t/merge_changelogs/ch-unreleased-merged | 24 | ||||
| -rw-r--r-- | scripts/t/merge_changelogs/ch-unreleased-merged-basic | 25 |
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 |