Re: Bug in merge (repro included)

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