1 1 Comparing and Merging Files 1 *************************** 1 1 This manual is for GNU Diffutils (version 3.6, 6 May 2017), and 1 documents the GNU 'diff', 'diff3', 'sdiff', and 'cmp' commands for 1 showing the differences between files and the GNU 'patch' command for 1 using their output to update files. 1 1 Copyright (C) 1992-1994, 1998, 2001-2002, 2004, 2006, 2009-2017 Free 1 Software Foundation, Inc. 1 1 Permission is granted to copy, distribute and/or modify this 1 document under the terms of the GNU Free Documentation License, 1 Version 1.3 or any later version published by the Free Software 1 Foundation; with no Invariant Sections, no Front-Cover Texts, and 1 no Back-Cover Texts. A copy of the license is included in the 1 section entitled "GNU Free Documentation License." 1
1 · Overview Preliminary information. · Comparison What file comparison means. 1 · Output Formats Formats for two-way difference reports. · Incomplete Lines Lines that lack trailing newlines. · Comparing Directories Comparing files and directories. · Adjusting Output Making 'diff' output prettier. · diff Performance Making 'diff' smarter or faster. 1 · Comparing Three Files Formats for three-way difference reports. · diff3 Merging Merging from a common ancestor. 1 · Interactive Merging Interactive merging with 'sdiff'. 1 · Merging with patch Using 'patch' to change old files into new ones. · Making Patches Tips for making and using patch distributions. 1 · Invoking cmp Compare two files byte by byte. · Invoking diff Compare two files line by line. · Invoking diff3 Compare three files line by line. · Invoking patch Apply a diff file to an original. · Invoking sdiff Side-by-side merge of file differences. 1 · Standards conformance Conformance to the POSIX standard. · Projects If you've found a bug or other shortcoming. 1 · Copying This Manual How to make copies of this manual. · Translations Available translations of this manual. · Index Index. 1