In <[email protected]>, on
04/12/2013
at 01:48 AM, Paul Gilmartin <[email protected]> said:
>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
A normal reading of "diff3 allows a 3 way merge" would be that there
are options to diff3 that cause it to perform the merge. Did you read
it as "diff3 creates output that you are allowed to feed into an
external program in order to do the merge"? If so, pretty much any
program "allows" you to do pretty much anything.
--
Shmuel (Seymour J.) Metz, SysProg and JOAT
Atid/2 <http://patriot.net/~shmuel>
We don't care. We don't have to care, we're Congress.
(S877: The Shut up and Eat Your spam act of 2003)
----------------------------------------------------------------------
For IBM-MAIN subscribe / signoff / archive access instructions,
send email to [email protected] with the message: INFO IBM-MAIN
