diff options
| author | Raphaël Hertzog <hertzog@debian.org> | 2011-07-29 00:53:30 +0200 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2011-07-29 00:53:30 +0200 |
| commit | 5c233019cc770fb59671090d4a9462adb149921f (patch) | |
| tree | 91f798f8ec403a3f7b3a65e0d0b5db52278e0da0 /scripts/dpkg-mergechangelogs.pl | |
| parent | a372b6a165de8876434828d2f7884b6e8840349b (diff) | |
| download | dpkg-5c233019cc770fb59671090d4a9462adb149921f.tar.gz | |
dpkg-mergechangelogs: use 7 characters for conflict markers
Reported-by: Andrew Bennetts <andrew.bennetts@canonical.com>
Diffstat (limited to 'scripts/dpkg-mergechangelogs.pl')
| -rwxr-xr-x | scripts/dpkg-mergechangelogs.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/dpkg-mergechangelogs.pl b/scripts/dpkg-mergechangelogs.pl index 9cc84f28c..a3ddeec61 100755 --- a/scripts/dpkg-mergechangelogs.pl +++ b/scripts/dpkg-mergechangelogs.pl @@ -286,5 +286,5 @@ sub get_conflict_block($$) { push @b, $b if defined $b; @a = @{$a} if ref($a) eq "ARRAY"; @b = @{$b} if ref($b) eq "ARRAY"; - return ("<<<<<<", @a, "======", @b, ">>>>>>"); + return ("<<<<<<<", @a, "=======", @b, ">>>>>>>"); } |