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

Re: naming of conficting files not documented

From: Lorenz <work_at_familie-lenhardt.de>
Date: 2004-11-04 16:54:43 CET

On Thu, 4 Nov 2004 09:15:36 -0600, Ben wrote:
>
>On Nov 4, 2004, at 5:19 AM, Lorenz wrote:
>
>> [..]
>> <file>.merge-links.rXY,
>> <file>.merge-rechts.rXY and
>> <file>.working
>> [..]
>
>What do you mean they're not documented? It's in the book right here:
>http://svnbook.red-bean.com/svnbook-1.0/ch03s05.html#svn-ch-3-sect-4.4

nope.

The book mentions <file>.rUV, <file>.rXY and <file>.mine
but I can't find the "merge-left/right" part or "working" anywhere.

Lorenz

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Nov 4 16:56:26 2004

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