Re: [PATCH] Add option to resolve conflicts by selecting a specific file (Issue 2784)

Eric Gillespie <epg@pretzelnet.org> writes:
> Unfortunately, i don't think we've finished painting this
> particular bikeshed yet ;->. I finally went and got myself a
> conflict so i could see if we could take name inspiration from
> there. So, how about svn_accept_{old,new,work} with strings
> "left", "new", and "working"?

I can't believe I'm writing this, http://green.bikeshed.com/, etc, but:
let's avoid needless grammar variations. svn_accept_{old,new,working}
would perfectly match the adjectives we actually use.

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jun 8 16:40:29 2007