Re: [PATCH 5/6] Implement 'm' option for conffile merging during conflict resolution

2009-11-07 Thread Jonathan Nieder
Hi, A few quick thoughts and questions about conffiledb_automerge: Sean Finney wrote: > This functions by performing a 3-way diff using the new conffile, the > currently-installed conffile, and the pristine version of the conffile > shipped in the currently installed package (in the conffile dat

[PATCH 5/6] Implement 'm' option for conffile merging during conflict resolution

2009-10-14 Thread Sean Finney
The conflict resolution prompt has been updated with a new option for automatic merging: Configuration file `' ==> Modified (by you or by a script) since installation. ==> Package distributor has shipped an updated version. What would you like to do about it ? Your options are: Y or I :