* On Sat, Jun 17, 2006 at 06:59:23PM +1000, Hal wrote: > There's a little gui-text-editor program called 'meld' which is just > awesome for this. Usually used for merging source code files. > if you install it you can do > $meld xorg.conf.knoppix xorg.conf.fedora > it will open the two files, side by side, with the differences > intuitively colour coded and allow you to merge the differences from one > into the other with a clicky clicky, as well as copy & paste or even > type. (Although avoiding typing is good, typos are more painful in > configuration than usual) > > /me used to use vimdiff, not anymore :-) > I believe there are others that do similar stuff, eg kdiff3 > Still you can't beat a dead tree sometimes too...
On a different topic, I had a play with meld and kdiff3. Both only seem to allow you to merge *all* differences from one file to another, not allowing you to choose differences line-by-line. (You can manually copy and paste lines, but not easily move one line of diffs from one file to another). 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. -- 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
