Sonia Hamilton wrote: > 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.
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: - the left side - the right side - neither - both (which results in a CVS style failed merge block). The merged file can then be saved as the left file, the right file ot something else. Erik -- +-----------------------------------------------------------+ Erik de Castro Lopo +-----------------------------------------------------------+ "The day Microsoft makes something that doesn't suck is probably the day they start making vacuum cleaners." -- Ernst Jan Plugge -- SLUG - Sydney Linux User's Group Mailing List - http://slug.org.au/ Subscription info and FAQs: http://slug.org.au/faq/mailinglists.html
