Re: svn status doesn't show a conflict

On 7/3/06, Garrett Rooney <rooneg@electricjellyfish.net> wrote:
> On 7/3/06, Erik Huelsmann <ehuels@gmail.com> wrote:
>
> > My thoughts would be that C should prevail, yes.
>
> Ok, works for me. I've got a patch here with a fix + test that I'm
> ready to commit, just waiting for the tests to finish running, then
> I'll check it in.

Committed in r20382. Erik, if you could take a look I'd appreciate it.

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jul 3 20:23:09 2006