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

Re: svn status doesn't show a conflict

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2006-07-03 20:16:03 CEST

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.


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:17:21 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.