Re: Patch command execution

On Fri, Feb 08, 2002 at 04:37:10PM -0600, Karl Fogel wrote:
> Sean Russell <ser@germane-software.com> writes:
> > How do you want the markup to appear in the modified local file? I
> > wanted to represent all three sets of information, so I was going to
> > use a modified CVS markup:
> >
> > >>>>>>>>>> ORIGINAL
> > ... original file lines here
> > ========== REPOSITORY
> > ... repository version lines here
> > ========== LOCAL
> > ... local file lines here
> > <<<<<<<<<< END
>
> Nice!

This is more or less what diff3 -A format looks like.

$ diff3 -m -A -L one -L two -L three A B C
1
<<<<<<< one
2
||||||| two
3
=======
4
>>>>>>> three

Unfortunately, it appears impossible to get a label on the ======
line.

zw

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:05 2006