On Thu, 11 Apr 2013 22:17:31 -0400, Shmuel Metz (Seymour J.) wrote: > on 04/10/2013 at 08:27 AM, Paul Gilmartin said: > >>On Wed, 10 Apr 2013 08:52:55 -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. > >ESPECIALLY the no part; it outputs disagreeing ranges of text, not an >updated source file. Were that not the case, the man file would not be >showing an example of piping the output to ed. > Sam said diff3 _allows_ a 3 way merge, which is correct, not that it _performs_ a 3-way merge, which you appear to be imputing to him then disagreeing with.
-- gil ---------------------------------------------------------------------- For IBM-MAIN subscribe / signoff / archive access instructions, send email to [email protected] with the message: INFO IBM-MAIN
