* Sami Liedes [Fri, 21 Mar 2008 04:34:36 +0200]: > I don't know if there's any previous work on this, There is <http://svn.debian.org/viewsvn/collab-qa/fileconflicts/>. I don't know how it compares to your code. Cheers, -- Adeodato Simó dato at net.com.org.es Debian Developer adeodato at debian.org When you don't know what to do, walk fast and look worried.