www.delorie.com/gnu/docs/diffutils/diff_91.html   search  
 
Buy GNU books!


Comparing and Merging Files

[ < ] [ > ]   [ << ] [ Up ] [ >> ]         [Top] [Contents] [Index] [ ? ]

14. Invoking diff3

The diff3 command compares three files and outputs descriptions of their differences. Its arguments are as follows:

 
diff3 options... mine older yours

The files to compare are mine, older, and yours. At most one of these three file names may be `-', which tells diff3 to read the standard input for that file.

An exit status of 0 means diff3 was successful, 1 means some conflicts were found, and 2 means trouble.

14.1 Options to diff3  Summary of options to diff3.


  webmaster   donations   bookstore     delorie software   privacy  
  Copyright 2003   by The Free Software Foundation     Updated Jun 2003