Re: filename extensions of conflicted files

----- Original Message -----
From: "Ben Collins-Sussman" <sussman@collab.net>
>
> You mean, back in svn 0.17, last January? That's what the CHANGES
> file says. It took you this long to notice? :-)

Ok, _that_ would look _really_ bad for me :)

>
> The book is correct, I'm not sure what you're talking about. I'm
> looking at chapter 3, 'resolving conflicts'.
>
> If you get a textual conflict on file 'foo', you end up with conflict
> markers in the working file, and three fulltexts: foo.mine, foo.rX,
> foo.rY.

actually, I was told that the "foo.mine" is now "foo.working".

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Sep 10 18:50:35 2003