* On Mon, Jun 19, 2006 at 05:06:57PM +1000, justin randell wrote: > >Anyone know of a gui tool that allows you to do this? I usually use > >vimdiff, but I'm looking for an easier to use tool for my (linux) > >students. > > kde's kompare is very nice for this. * On Mon, Jun 19, 2006 at 05:21:24PM +1000, Michael Lake wrote: > Try tkdiff. It can create a merge file from two files. > Maybe it might do what you want. > > I find fldiff very good as its fast and has a good interface but it doesn't > do merging. Tkdiff is a bit slow.
* On Mon, Jun 19, 2006 at 05:52:54PM +1000, Erik de Castro Lopo wrote: > Have a look at mgdiff (its in Debian and Ubuntu). > > I've added a couple of features to mgdiff over the years, one of which > allows you , for each difference, to choose: * On Tue, Jun 20, 2006 at 10:21:59AM +1000, Phil Scarratt wrote: > Meld actually does allow you to do this - well it does on mine anyway :) > Mine has arrows down the middle which do this when clicked on. Thanks guys. I had a play with most of these - most seemed to have clunky interfaces and/or not allow applying single line diffs (though I'm running on breezy not dapper, so I mightn't have the latest versions). Kompare seemed ok, but a bit clumsy in the way you have to 'switch directions' to take diffs from each file. I'll try with the later versions... -- Sonia Hamilton. GPG key A8B77238. . "Complaining that Linux doesn't work well with Windows is like ... oh, say, evaluating an early automobile and complaining that there's no place to hitch up a horse." (Daniel Dvorkin) -- SLUG - Sydney Linux User's Group Mailing List - http://slug.org.au/ Subscription info and FAQs: http://slug.org.au/faq/mailinglists.html
