I (Julian Foad) wrote: > Oh, and let's not forget 'patch'. Patch looks roughly like this: > > * read diff information from the patch file > > --> merge this diff into the WC working/actual state > > (patch-merge, like a 3-way merge; don't record mergeinfo; > record conflicts; ...) > > * run conflict resolver
As stsp pointed out on IRC, 'patch' does search & replace which is pretty different from 3-way merge. Thanks, Stefan, for pointing that out. - Julian
