Processed: retitle 290854 to [CONFFILE] add conflict options to start an editor or start a merge ...

[owner@bugs.debian.org (Debian Bug Tracking System)]

Processing commands for control@bugs.debian.org:

> # Automatically generated email from bts, devscripts version 2.7.95.1
> retitle 290854 [CONFFILE] add conflict options to start an editor or start a merge
Bug#290854: In installed vs. packager version conflicts would be usefull to add option to edit files and/or start merge editors.
Changed Bug title.

> merge 290854 48717
Bug#48717: [CONFFILE] dpkg: could be more useful wrt conffile diffs
Bug#290854: [CONFFILE] add conflict options to start an editor or start a merge
Bug#32877: [CONFFILE] Cleverer conffile merge
Bug#120152: [CONFFILE] dpkg: Merge changes to conffiles in with sdiff(1)
Bug#189805: improvment: use of sdiff to merge configuration-files
Bug#247336: allow viewing diff of configuration file changes
Bug#268154: apt-get: Upgrading should offer runninf a diff program, not just (D)
Merged 32877 48717 120152 189805 247336 268154 290854.

>
End of message, stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)