I'll second that. I've been using meld for the last 3 or 4 months and am very happy with it. It handles 2- and 3-way merging graphically, allows editing, and updates its display as it goes.
Roy. On 11/09/06 11:26, John Carter wrote: > Branches and merges and diffs seem to be a major feature of working > here. > > So I'm always on the look out for a good tool. Fortunately I use Debian > so there is a vast range available to me and I have explored them all. > > I have finally found one that I'm really very very pleased with. > > meld. > > Ubuntu has it, just install it from synaptic. > > Source site is... > http://meld.sourceforge.net/
