etch: 3-way merge of conf files

["Paul Smith" <psmith@nortel.com>]

I was reading some of the potential Etch goals on debian-devel, and
there's one thing that I've wanted for years and years, since like the
second day I started using Debian:

  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=32877


Anyone have any idea on when something like this will be available?

-- 
-------------------------------------------------------------------------------
 Paul D. Smith <psmith@nortel.com>           HASMAT: HA Software Mthds & Tools
 "Please remain calm...I may be mad, but I am a professional." --Mad Scientist
-------------------------------------------------------------------------------
   These are my opinions---Nortel Networks takes no responsibility for them.