Re: svn commit: r25670 - in trunk/subversion: include libsvn_subr libsvn_wc svn tests/cmdline/svntest

Also, hmm. In svn_wc_conflict_description_t I'm not really
comfortable with the way that the "real" version the file (the one
without any suffixes, the one that (a)ccept accepts, the only one
that's worth editing) is sometimes user_file and sometimes
merged_file, depending on whether or not the file is binary. I see
why you did that but I'm wondering if there's a better way (like
making both user_file and merged_file the same file? or making
user_file be the NULL one for binary files?).

--dave

-- 
David Glasser | glasser_at_mit.edu | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org