tag 120152 + patch thanks, Here's a patch that implements support for sdiff, or more generally "manual merge" (and actually fixes a few other bugs while doing so). Proposed changelog entries: * Added a 'Merge' option (Closes: #189805, #48717, #120152) * Enclosed file names with quotes in command string (Closes #147583) * Added a message with the path of the new conffile in Suspend * Ignore SIGINT while waiting for child processes so that dpkg doesn't die if the child is ctrl-c'd The patch adds a new 'M' option to the conflict prompt whenever environment variable 'MERGE2' is set or '/usr/bin/merge2' exists. To make merging a bit more comfortable, I've also written a fullscreen ncurses based drop-in replacement for sdiff (not in Main yet: http://elonen.iki.fi/code/imediff/). It registers itself as a 'merge2' alternative through 'update-alternatives', thus the '/usr/bin/merge2' check in the dpkg patch. I hope sdiff maintainer will agree with me to register sdiff also and I'm furthermore considering writing an sdiff compatibility wrapper around 'kompare'. - Jarno
Attachment:
dpkg-merge.patch.bz2
Description: BZip2 compressed data