[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Bug in merge (repro included)

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2005-02-03 18:08:39 CET

Philip Martin <philip@codematters.co.uk> writes:

> $ diff3 -m foo-t foo-b1 foo-b2

  a Oops! I missed a line out.

> b
> B
> c
> <<<<<<< foo-b1
> d
> =======
>>>>>>>> foo-b2
> e

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Feb 3 18:09:57 2005

This is an archived mail posted to the Subversion Dev mailing list.