by David MacKenzie, Paul Eggert, and Richard Stallman
This manual describes how to compare and merge files using GNU diff and patch.
It includes an extensive tutorial that guides the reader through all the options of the diff and patch commands. Later chapters cover powerful time-saving techniques such as automatic merging of divergent branches of a source tree.