Bug number - 413436

Part of package: aptitude.

Bug description:

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19


Debian Bug report logs -  #413436 [CONFFILE] Cleverer conffile merge
Package:      dpkg; Maintainer for dpkg is Dpkg Developers <debian-dpkg@lists.debian.org>; Source for dpkg is src:dpkg (PTS, buildd, popcon).
Reported by: nion@debian.org
Date: Sun,  4 Mar 2007 23:48:01 UTC
Severity: wishlist
Tags: upstream
Merged with 32877,
48717,
120152,
189805,
247336,
268154,
290854,
294073,
440640,
473996,
548663,
578804
Found in versions dpkg/1.13.22, dpkg/1.13.25, dpkg/1.15.3.1, dpkg/1.15.5.6

All x-patch and x-diff attachments.

Patch	Author	Date
dpkg_allowmerge.patch	Nico Golde <nico@ngolde.de>	Mon, 5 Mar 2007 19:52:36 +0100

Original bug report here.