Re: filename extensions of conflicted files

----- Original Message -----
From: <cmpilato@collab.net>
>
> Didn't "yours" and "older" become "rX" and "rY" (where X and Y are
> revision numbers) ? I forget.

That once was. But I'm not sure it still is. I found while browsing the
source two possibilities:
/libsvn_client/diff.c, line 603 ff : .merge-left.r%, .merge-right.r%
but in
libsvn_subr/io.c, line 1270 ff: .old, .new

Someone with a deep insight?

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:46:08 2003