28.2 Comparing Three Different Versions with diff3
For each set of differences, diff3
displays a row of equal
With the output of diff3
, it is easy to keep track of which file
is which; however, the prescription given is a little harder to
To bring these files into agreement, the first range of text
The diff3 command also has a -e option for creating an editing script for ed . It doesn't work quite the way you might think. Basically, it creates a script for building the first file from the second and third files.
If you reverse the second and third files, a different script is produced:
As you might guess, this is basically the same output as doing
on the first and third files.
(The only difference in the output is the result of a
rather errant inconsistency between diff
The System V version of diff3
produces an ed
script that ends
with the commands that save the edited version of the file.
The Berkeley diff3
, and both versions of diff
, require that you
- from UNIX Text Processing , Hayden Books, 1987, Chapter 11