Meld is a tool which allows the user to see the changes in, and merge between, either two files or two files with a common ancestor.
Jason H. says,
Thanks for debaday -- it's a good source of information. I thought I'd recommend the 'meld' package. Viewing differences between source trees and merging changes back and forth was a tedious, error-prone procedure until I discovered meld. People should know about it.
I guess more people should know about it. I'm going to have to break down and build myself a box with a video card running X and all these goodies. Merging changes between files should not be painful (and should not require a GUI either in my insignificant opinion).
More information on this package can be found on the Debian web site.
(If there is a package you would like to see featured here, go to the userinfo page and follow the directions there to submit your entry.)