From mboxrd@z Thu Jan  1 00:00:00 1970
Message-ID: <f04e87821d7bc62ef4d0ff825a8348af@collyer.net>
To: 9fans@cse.psu.edu
Subject: Re: [9fans] OT -  CVS-like merge for dumpfs / relica with sources
From: Geoff Collyer <geoff@collyer.net>
MIME-Version: 1.0
Content-Type: text/plain; charset="US-ASCII"
Content-Transfer-Encoding: 7bit
Date: Tue, 26 Nov 2002 16:11:16 -0800
Topicbox-Message-UUID: 28a53baa-eacb-11e9-9e20-41e7f4b1d025

I use idiff(1).  It's not automatic, but it's simple and easy.