summaryrefslogtreecommitdiffstats
path: root/scripts/t/merge_changelogs/ch-unreleased-merged-basic
blob: dd6938c1025ecb0a4f25357b8f710bcaf9aca3f1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
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