On Tue, 9 Apr 2013 19:24:53 -0400, Shmuel Metz (Seymour J.) wrote:
>
>on 04/07/2013 at 04:57 PM, Sam Siegel said:
>
>>diff3 allows a 3 way merge between the original source and 2
>>different updates to the original source.
>
>No; it merges two updates.
>
ksh:1+ man diff3
Reformatting page. Please Wait... done
...
NAME
diff3 - 3-way differential file comparison
SYNOPSIS
diff3 [-exEX3] filename1 filename2 filename3
DESCRIPTION
diff3 compares three versions of a file. It publishes
disagreeing ranges of text flagged with the following codes:
...
The following command applies the resulting script to
filename1.
(cat script; echo '1,$p') | ed - filename1
...
-- gil
----------------------------------------------------------------------
For IBM-MAIN subscribe / signoff / archive access instructions,
send email to [email protected] with the message: INFO IBM-MAIN
